@credo-ts/core 0.6.0-pr-2134-20241217213340 → 0.6.0-pr-2195-20250217170804

package/build/crypto/jose/jwk/K256Jwk.d.ts

@@ -1,6 +1,5 @@
 import type { JwkJson } from './Jwk';
 import type { JwaEncryptionAlgorithm } from '../jwa/alg';
-import { Buffer } from '../../../utils';
 import { KeyType } from '../../KeyType';
 import { JwaCurve, JwaKeyType } from '../jwa';
 import { JwaSignatureAlgorithm } from '../jwa/alg';
@@ -9,27 +8,29 @@ export declare class K256Jwk extends Jwk {
     static readonly supportedEncryptionAlgorithms: JwaEncryptionAlgorithm[];
     static readonly supportedSignatureAlgorithms: JwaSignatureAlgorithm[];
     static readonly keyType = KeyType.K256;
-    readonly x: string;
-    readonly y: string;
+    private readonly affinePoint;
     constructor({ x, y }: {
-        x: string;
-        y: string;
+        x: string | Uint8Array;
+        y: string | Uint8Array;
     });
     get kty(): JwaKeyType.EC;
     get crv(): JwaCurve.Secp256k1;
+    get x(): string;
+    get y(): string;
     /**
-     * Returns the public key of the K-256 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-256 JWK.
      */
-    get publicKey(): Buffer;
+    get publicKey(): Uint8Array;
+    /**
+     * Returns the compressed public key of the K-256 JWK.
+     */
+    get publicKeyCompressed(): Uint8Array;
     get keyType(): KeyType;
     get supportedEncryptionAlgorithms(): JwaEncryptionAlgorithm[];
     get supportedSignatureAlgorithms(): JwaSignatureAlgorithm[];
     toJson(): K256JwkJson;
     static fromJson(jwkJson: JwkJson): K256Jwk;
-    static fromPublicKey(publicKey: Buffer): K256Jwk;
+    static fromPublicKey(publicKey: Uint8Array): K256Jwk;
 }
 export interface K256JwkJson extends JwkJson {
     kty: JwaKeyType.EC;

package/build/crypto/jose/jwk/K256Jwk.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.K256Jwk = void 0;
 exports.isValidK256JwkPublicKey = isValidK256JwkPublicKey;
+const ec_compression_1 = require("ec-compression");
+const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
 const KeyType_1 = require("../../KeyType");
 const jwa_1 = require("../jwa");
 const alg_1 = require("../jwa/alg");
 const Jwk_1 = require("./Jwk");
-const ecCompression_1 = require("./ecCompression");
 const validate_1 = require("./validate");
 class K256Jwk extends Jwk_1.Jwk {
     constructor({ x, y }) {
         super();
-        this.x = x;
-        this.y = y;
+        const xAsBytes = typeof x === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(x)) : x;
+        const yAsBytes = typeof y === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(y)) : y;
+        this.affinePoint = new ec_compression_1.AffinePoint(xAsBytes, yAsBytes);
     }
     get kty() {
         return jwa_1.JwaKeyType.EC;
@@ -21,16 +23,23 @@ class K256Jwk extends Jwk_1.Jwk {
     get crv() {
         return jwa_1.JwaCurve.Secp256k1;
     }
+    get x() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.xBytes);
+    }
+    get y() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.yBytes);
+    }
     /**
-     * Returns the public key of the K-256 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-256 JWK.
      */
     get publicKey() {
-        const publicKeyBuffer = utils_1.Buffer.concat([utils_1.TypedArrayEncoder.fromBase64(this.x), utils_1.TypedArrayEncoder.fromBase64(this.y)]);
-        const compressedPublicKey = (0, ecCompression_1.compress)(publicKeyBuffer);
-        return utils_1.Buffer.from(compressedPublicKey);
+        return this.affinePoint.decompressedForm;
+    }
+    /**
+     * Returns the compressed public key of the K-256 JWK.
+     */
+    get publicKeyCompressed() {
+        return this.affinePoint.compressedForm;
     }
     get keyType() {
         return K256Jwk.keyType;
@@ -42,7 +51,12 @@ class K256Jwk extends Jwk_1.Jwk {
         return K256Jwk.supportedSignatureAlgorithms;
     }
     toJson() {
-        return Object.assign(Object.assign({}, super.toJson()), { crv: this.crv, x: this.x, y: this.y });
+        return {
+            ...super.toJson(),
+            crv: this.crv,
+            x: this.x,
+            y: this.y,
+        };
     }
     static fromJson(jwkJson) {
         if (!isValidK256JwkPublicKey(jwkJson)) {
@@ -54,13 +68,15 @@ class K256Jwk extends Jwk_1.Jwk {
         });
     }
     static fromPublicKey(publicKey) {
-        const expanded = (0, ecCompression_1.expand)(publicKey, jwa_1.JwaCurve.Secp256k1);
-        const x = expanded.slice(0, expanded.length / 2);
-        const y = expanded.slice(expanded.length / 2);
-        return new K256Jwk({
-            x: utils_1.TypedArrayEncoder.toBase64URL(x),
-            y: utils_1.TypedArrayEncoder.toBase64URL(y),
-        });
+        if ((0, ec_compression_1.isValidCompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp256k1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromCompressedPoint(publicKey, ec_compression_1.Secp256k1);
+            return new K256Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        if ((0, ec_compression_1.isValidDecompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp256k1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromDecompressedPoint(publicKey, ec_compression_1.Secp256k1);
+            return new K256Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        throw new error_1.CredoError(`${this.keyType} public key is neither a valid compressed or uncompressed key. Key prefix '${publicKey[0]}', key length '${publicKey.length}'`);
     }
 }
 exports.K256Jwk = K256Jwk;

package/build/crypto/jose/jwk/K256Jwk.js.map

@@ -1 +1 @@
-{"version":3,"file":"K256Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/K256Jwk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"K256Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/K256Jwk.ts"],"names":[],"mappings":"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"}

package/build/crypto/jose/jwk/P256Jwk.d.ts

@@ -1,6 +1,5 @@
 import type { JwkJson } from './Jwk';
 import type { JwaEncryptionAlgorithm } from '../jwa/alg';
-import { Buffer } from '../../../utils';
 import { KeyType } from '../../KeyType';
 import { JwaCurve, JwaKeyType } from '../jwa';
 import { JwaSignatureAlgorithm } from '../jwa/alg';
@@ -9,27 +8,29 @@ export declare class P256Jwk extends Jwk {
     static readonly supportedEncryptionAlgorithms: JwaEncryptionAlgorithm[];
     static readonly supportedSignatureAlgorithms: JwaSignatureAlgorithm[];
     static readonly keyType = KeyType.P256;
-    readonly x: string;
-    readonly y: string;
+    private readonly affinePoint;
     constructor({ x, y }: {
-        x: string;
-        y: string;
+        x: string | Uint8Array;
+        y: string | Uint8Array;
     });
     get kty(): JwaKeyType.EC;
     get crv(): JwaCurve.P256;
+    get x(): string;
+    get y(): string;
     /**
-     * Returns the public key of the P-256 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-256 JWK.
      */
-    get publicKey(): Buffer;
+    get publicKey(): Uint8Array;
+    /**
+     * Returns the compressed public key of the P-256 JWK.
+     */
+    get publicKeyCompressed(): Uint8Array;
     get keyType(): KeyType;
     get supportedEncryptionAlgorithms(): JwaEncryptionAlgorithm[];
     get supportedSignatureAlgorithms(): JwaSignatureAlgorithm[];
     toJson(): P256JwkJson;
     static fromJson(jwkJson: JwkJson): P256Jwk;
-    static fromPublicKey(publicKey: Buffer): P256Jwk;
+    static fromPublicKey(publicKey: Uint8Array): P256Jwk;
 }
 export interface P256JwkJson extends JwkJson {
     kty: JwaKeyType.EC;

package/build/crypto/jose/jwk/P256Jwk.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.P256Jwk = void 0;
 exports.isValidP256JwkPublicKey = isValidP256JwkPublicKey;
+const ec_compression_1 = require("ec-compression");
+const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
 const KeyType_1 = require("../../KeyType");
 const jwa_1 = require("../jwa");
 const alg_1 = require("../jwa/alg");
 const Jwk_1 = require("./Jwk");
-const ecCompression_1 = require("./ecCompression");
 const validate_1 = require("./validate");
 class P256Jwk extends Jwk_1.Jwk {
     constructor({ x, y }) {
         super();
-        this.x = x;
-        this.y = y;
+        const xAsBytes = typeof x === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(x)) : x;
+        const yAsBytes = typeof y === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(y)) : y;
+        this.affinePoint = new ec_compression_1.AffinePoint(xAsBytes, yAsBytes);
     }
     get kty() {
         return jwa_1.JwaKeyType.EC;
@@ -21,16 +23,23 @@ class P256Jwk extends Jwk_1.Jwk {
     get crv() {
         return jwa_1.JwaCurve.P256;
     }
+    get x() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.xBytes);
+    }
+    get y() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.yBytes);
+    }
     /**
-     * Returns the public key of the P-256 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-256 JWK.
      */
     get publicKey() {
-        const publicKeyBuffer = utils_1.Buffer.concat([utils_1.TypedArrayEncoder.fromBase64(this.x), utils_1.TypedArrayEncoder.fromBase64(this.y)]);
-        const compressedPublicKey = (0, ecCompression_1.compress)(publicKeyBuffer);
-        return utils_1.Buffer.from(compressedPublicKey);
+        return this.affinePoint.decompressedForm;
+    }
+    /**
+     * Returns the compressed public key of the P-256 JWK.
+     */
+    get publicKeyCompressed() {
+        return this.affinePoint.compressedForm;
     }
     get keyType() {
         return P256Jwk.keyType;
@@ -42,7 +51,12 @@ class P256Jwk extends Jwk_1.Jwk {
         return P256Jwk.supportedSignatureAlgorithms;
     }
     toJson() {
-        return Object.assign(Object.assign({}, super.toJson()), { crv: this.crv, x: this.x, y: this.y });
+        return {
+            ...super.toJson(),
+            crv: this.crv,
+            x: this.x,
+            y: this.y,
+        };
     }
     static fromJson(jwkJson) {
         if (!isValidP256JwkPublicKey(jwkJson)) {
@@ -54,13 +68,15 @@ class P256Jwk extends Jwk_1.Jwk {
         });
     }
     static fromPublicKey(publicKey) {
-        const expanded = (0, ecCompression_1.expand)(publicKey, jwa_1.JwaCurve.P256);
-        const x = expanded.slice(0, expanded.length / 2);
-        const y = expanded.slice(expanded.length / 2);
-        return new P256Jwk({
-            x: utils_1.TypedArrayEncoder.toBase64URL(x),
-            y: utils_1.TypedArrayEncoder.toBase64URL(y),
-        });
+        if ((0, ec_compression_1.isValidCompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp256r1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromCompressedPoint(publicKey, ec_compression_1.Secp256r1);
+            return new P256Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        if ((0, ec_compression_1.isValidDecompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp256r1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromDecompressedPoint(publicKey, ec_compression_1.Secp256r1);
+            return new P256Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        throw new error_1.CredoError(`${this.keyType} public key is neither a valid compressed or uncompressed key. Key prefix '${publicKey[0]}', key length '${publicKey.length}'`);
     }
 }
 exports.P256Jwk = P256Jwk;

package/build/crypto/jose/jwk/P256Jwk.js.map

@@ -1 +1 @@
-{"version":3,"file":"P256Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/P256Jwk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"P256Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/P256Jwk.ts"],"names":[],"mappings":";;;AA0HA,0DAWC;AAlID,mDAKuB;AAEvB,0CAA2C;AAC3C,0CAAkD;AAClD,2CAAuC;AACvC,gCAA6C;AAC7C,oCAAkD;AAElD,+BAA2B;AAC3B,yCAAoE;AAEpE,MAAa,OAAQ,SAAQ,SAAG;IAO9B,YAAmB,EAAE,CAAC,EAAE,CAAC,EAAsD;QAC7E,KAAK,EAAE,CAAA;QAEP,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,yBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7F,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,yBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAE7F,IAAI,CAAC,WAAW,GAAG,IAAI,4BAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACxD,CAAC;IAED,IAAW,GAAG;QACZ,OAAO,gBAAU,CAAC,EAAW,CAAA;IAC/B,CAAC;IAED,IAAW,GAAG;QACZ,OAAO,cAAQ,CAAC,IAAa,CAAA;IAC/B,CAAC;IAED,IAAW,CAAC;QACV,OAAO,yBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAC/D,CAAC;IAED,IAAW,CAAC;QACV,OAAO,yBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAC/D,CAAC;IAED;;OAEG;IACH,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAA;IAC1C,CAAC;IAED;;OAEG;IACH,IAAW,mBAAmB;QAC5B,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAA;IACxC,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,OAAO,CAAC,OAAO,CAAA;IACxB,CAAC;IAED,IAAW,6BAA6B;QACtC,OAAO,OAAO,CAAC,6BAA6B,CAAA;IAC9C,CAAC;IAED,IAAW,4BAA4B;QACrC,OAAO,OAAO,CAAC,4BAA4B,CAAA;IAC7C,CAAC;IAEM,MAAM;QACX,OAAO;YACL,GAAG,KAAK,CAAC,MAAM,EAAE;YACjB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,CAAC,EAAE,IAAI,CAAC,CAAC;YACT,CAAC,EAAE,IAAI,CAAC,CAAC;SACK,CAAA;IAClB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,OAAgB;QACrC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QAED,OAAO,IAAI,OAAO,CAAC;YACjB,CAAC,EAAE,OAAO,CAAC,CAAC;YACZ,CAAC,EAAE,OAAO,CAAC,CAAC;SACb,CAAC,CAAA;IACJ,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,SAAqB;QAC/C,IAAI,IAAA,iDAAgC,EAAC,SAAS,EAAE,0BAAS,CAAC,EAAE,CAAC;YAC3D,MAAM,WAAW,GAAG,4BAAW,CAAC,mBAAmB,CAAC,SAAS,EAAE,0BAAS,CAAC,CAAA;YACzE,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QACtE,CAAC;QAED,IAAI,IAAA,mDAAkC,EAAC,SAAS,EAAE,0BAAS,CAAC,EAAE,CAAC;YAC7D,MAAM,WAAW,GAAG,4BAAW,CAAC,qBAAqB,CAAC,SAAS,EAAE,0BAAS,CAAC,CAAA;YAC3E,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QACtE,CAAC;QAED,MAAM,IAAI,kBAAU,CAClB,GAAG,IAAI,CAAC,OAAO,8EAA8E,SAAS,CAAC,CAAC,CAAC,kBAAkB,SAAS,CAAC,MAAM,GAAG,CAC/I,CAAA;IACH,CAAC;;AA5FH,0BA6FC;AA5FwB,qCAA6B,GAA6B,EAAE,CAAA;AAC5D,oCAA4B,GAA4B,CAAC,2BAAqB,CAAC,KAAK,CAAC,CAAA;AACrF,eAAO,GAAG,iBAAO,CAAC,IAAI,CAAA;AAoG/C,SAAgB,uBAAuB,CAAC,GAAY;IAClD,OAAO,CACL,IAAA,iBAAM,EAAC,GAAG,EAAE,gBAAU,CAAC,EAAE,CAAC;QAC1B,IAAA,iBAAM,EAAC,GAAG,EAAE,cAAQ,CAAC,IAAI,CAAC;QAC1B,IAAA,eAAI,EAAC,GAAG,CAAC;QACT,IAAA,eAAI,EAAC,GAAG,CAAC;QACT,IAAA,sBAAW,EAAC,GAAG,EAAE;YACf,kBAAkB,EAAE,IAAI;YACxB,eAAe,EAAE,IAAI;SACtB,CAAC,CACH,CAAA;AACH,CAAC"}

package/build/crypto/jose/jwk/P384Jwk.d.ts

@@ -1,6 +1,5 @@
 import type { JwkJson } from './Jwk';
 import type { JwaEncryptionAlgorithm } from '../jwa/alg';
-import { Buffer } from '../../../utils';
 import { KeyType } from '../../KeyType';
 import { JwaCurve, JwaKeyType } from '../jwa';
 import { JwaSignatureAlgorithm } from '../jwa/alg';
@@ -9,27 +8,29 @@ export declare class P384Jwk extends Jwk {
     static readonly supportedEncryptionAlgorithms: JwaEncryptionAlgorithm[];
     static readonly supportedSignatureAlgorithms: JwaSignatureAlgorithm[];
     static readonly keyType = KeyType.P384;
-    readonly x: string;
-    readonly y: string;
+    private readonly affinePoint;
     constructor({ x, y }: {
-        x: string;
-        y: string;
+        x: string | Uint8Array;
+        y: string | Uint8Array;
     });
     get kty(): JwaKeyType.EC;
     get crv(): JwaCurve.P384;
     get keyType(): KeyType;
     get supportedEncryptionAlgorithms(): JwaEncryptionAlgorithm[];
     get supportedSignatureAlgorithms(): JwaSignatureAlgorithm[];
+    get x(): string;
+    get y(): string;
     /**
-     * Returns the public key of the P-384 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-384 JWK.
      */
-    get publicKey(): Buffer;
+    get publicKey(): Uint8Array;
+    /**
+     * Returns the compressed public key of the P-384 JWK.
+     */
+    get publicKeyCompressed(): Uint8Array;
     toJson(): P384JwkJson;
     static fromJson(jwk: JwkJson): P384Jwk;
-    static fromPublicKey(publicKey: Buffer): P384Jwk;
+    static fromPublicKey(publicKey: Uint8Array): P384Jwk;
 }
 export interface P384JwkJson extends JwkJson {
     kty: JwaKeyType.EC;

package/build/crypto/jose/jwk/P384Jwk.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.P384Jwk = void 0;
 exports.isValidP384JwkPublicKey = isValidP384JwkPublicKey;
+const ec_compression_1 = require("ec-compression");
+const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
 const KeyType_1 = require("../../KeyType");
 const jwa_1 = require("../jwa");
 const alg_1 = require("../jwa/alg");
 const Jwk_1 = require("./Jwk");
-const ecCompression_1 = require("./ecCompression");
 const validate_1 = require("./validate");
 class P384Jwk extends Jwk_1.Jwk {
     constructor({ x, y }) {
         super();
-        this.x = x;
-        this.y = y;
+        const xAsBytes = typeof x === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(x)) : x;
+        const yAsBytes = typeof y === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(y)) : y;
+        this.affinePoint = new ec_compression_1.AffinePoint(xAsBytes, yAsBytes);
     }
     get kty() {
         return jwa_1.JwaKeyType.EC;
@@ -30,19 +32,31 @@ class P384Jwk extends Jwk_1.Jwk {
     get supportedSignatureAlgorithms() {
         return P384Jwk.supportedSignatureAlgorithms;
     }
+    get x() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.xBytes);
+    }
+    get y() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.yBytes);
+    }
     /**
-     * Returns the public key of the P-384 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-384 JWK.
      */
     get publicKey() {
-        const publicKeyBuffer = utils_1.Buffer.concat([utils_1.TypedArrayEncoder.fromBase64(this.x), utils_1.TypedArrayEncoder.fromBase64(this.y)]);
-        const compressedPublicKey = (0, ecCompression_1.compress)(publicKeyBuffer);
-        return utils_1.Buffer.from(compressedPublicKey);
+        return this.affinePoint.decompressedForm;
+    }
+    /**
+     * Returns the compressed public key of the P-384 JWK.
+     */
+    get publicKeyCompressed() {
+        return this.affinePoint.compressedForm;
     }
     toJson() {
-        return Object.assign(Object.assign({}, super.toJson()), { crv: this.crv, x: this.x, y: this.y });
+        return {
+            ...super.toJson(),
+            crv: this.crv,
+            x: this.x,
+            y: this.y,
+        };
     }
     static fromJson(jwk) {
         if (!isValidP384JwkPublicKey(jwk)) {
@@ -54,13 +68,15 @@ class P384Jwk extends Jwk_1.Jwk {
         });
     }
     static fromPublicKey(publicKey) {
-        const expanded = (0, ecCompression_1.expand)(publicKey, jwa_1.JwaCurve.P384);
-        const x = expanded.slice(0, expanded.length / 2);
-        const y = expanded.slice(expanded.length / 2);
-        return new P384Jwk({
-            x: utils_1.TypedArrayEncoder.toBase64URL(x),
-            y: utils_1.TypedArrayEncoder.toBase64URL(y),
-        });
+        if ((0, ec_compression_1.isValidCompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp384r1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromCompressedPoint(publicKey, ec_compression_1.Secp384r1);
+            return new P384Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        if ((0, ec_compression_1.isValidDecompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp384r1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromDecompressedPoint(publicKey, ec_compression_1.Secp384r1);
+            return new P384Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        throw new error_1.CredoError(`${this.keyType} public key is neither a valid compressed or uncompressed key. Key prefix '${publicKey[0]}', key length '${publicKey.length}'`);
     }
 }
 exports.P384Jwk = P384Jwk;

package/build/crypto/jose/jwk/P384Jwk.js.map

@@ -1 +1 @@
-{"version":3,"file":"P384Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/P384Jwk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"P384Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/P384Jwk.ts"],"names":[],"mappings":"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"}

package/build/crypto/jose/jwk/P521Jwk.d.ts

@@ -1,6 +1,5 @@
 import type { JwkJson } from './Jwk';
 import type { JwaEncryptionAlgorithm } from '../jwa/alg';
-import { Buffer } from '../../../utils';
 import { KeyType } from '../../KeyType';
 import { JwaCurve, JwaKeyType } from '../jwa';
 import { JwaSignatureAlgorithm } from '../jwa/alg';
@@ -9,27 +8,29 @@ export declare class P521Jwk extends Jwk {
     static readonly supportedEncryptionAlgorithms: JwaEncryptionAlgorithm[];
     static readonly supportedSignatureAlgorithms: JwaSignatureAlgorithm[];
     static readonly keyType = KeyType.P521;
-    readonly x: string;
-    readonly y: string;
+    private readonly affinePoint;
     constructor({ x, y }: {
-        x: string;
-        y: string;
+        x: string | Uint8Array;
+        y: string | Uint8Array;
     });
     get kty(): JwaKeyType.EC;
     get crv(): JwaCurve.P521;
     get keyType(): KeyType;
     get supportedEncryptionAlgorithms(): JwaEncryptionAlgorithm[];
     get supportedSignatureAlgorithms(): JwaSignatureAlgorithm[];
+    get x(): string;
+    get y(): string;
     /**
-     * Returns the public key of the P-521 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-521 JWK.
      */
-    get publicKey(): Buffer;
+    get publicKey(): Uint8Array;
+    /**
+     * Returns the compressed public key of the P-521 JWK.
+     */
+    get publicKeyCompressed(): Uint8Array;
     toJson(): P521JwkJson;
     static fromJson(jwk: JwkJson): P521Jwk;
-    static fromPublicKey(publicKey: Buffer): P521Jwk;
+    static fromPublicKey(publicKey: Uint8Array): P521Jwk;
 }
 export interface P521JwkJson extends JwkJson {
     kty: JwaKeyType.EC;

package/build/crypto/jose/jwk/P521Jwk.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.P521Jwk = void 0;
 exports.isValidP521JwkPublicKey = isValidP521JwkPublicKey;
+const ec_compression_1 = require("ec-compression");
+const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
 const KeyType_1 = require("../../KeyType");
 const jwa_1 = require("../jwa");
 const alg_1 = require("../jwa/alg");
 const Jwk_1 = require("./Jwk");
-const ecCompression_1 = require("./ecCompression");
 const validate_1 = require("./validate");
 class P521Jwk extends Jwk_1.Jwk {
     constructor({ x, y }) {
         super();
-        this.x = x;
-        this.y = y;
+        const xAsBytes = typeof x === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(x)) : x;
+        const yAsBytes = typeof y === 'string' ? Uint8Array.from(utils_1.TypedArrayEncoder.fromBase64(y)) : y;
+        this.affinePoint = new ec_compression_1.AffinePoint(xAsBytes, yAsBytes);
     }
     get kty() {
         return jwa_1.JwaKeyType.EC;
@@ -30,19 +32,31 @@ class P521Jwk extends Jwk_1.Jwk {
     get supportedSignatureAlgorithms() {
         return P521Jwk.supportedSignatureAlgorithms;
     }
+    get x() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.xBytes);
+    }
+    get y() {
+        return utils_1.TypedArrayEncoder.toBase64URL(this.affinePoint.yBytes);
+    }
     /**
-     * Returns the public key of the P-521 JWK.
-     *
-     * NOTE: this is the compressed variant. We still need to add support for the
-     * uncompressed variant.
+     * Returns the uncompressed public key of the P-521 JWK.
      */
     get publicKey() {
-        const publicKeyBuffer = utils_1.Buffer.concat([utils_1.TypedArrayEncoder.fromBase64(this.x), utils_1.TypedArrayEncoder.fromBase64(this.y)]);
-        const compressedPublicKey = (0, ecCompression_1.compress)(publicKeyBuffer);
-        return utils_1.Buffer.from(compressedPublicKey);
+        return this.affinePoint.decompressedForm;
+    }
+    /**
+     * Returns the compressed public key of the P-521 JWK.
+     */
+    get publicKeyCompressed() {
+        return this.affinePoint.compressedForm;
     }
     toJson() {
-        return Object.assign(Object.assign({}, super.toJson()), { crv: this.crv, x: this.x, y: this.y });
+        return {
+            ...super.toJson(),
+            crv: this.crv,
+            x: this.x,
+            y: this.y,
+        };
     }
     static fromJson(jwk) {
         if (!isValidP521JwkPublicKey(jwk)) {
@@ -54,13 +68,15 @@ class P521Jwk extends Jwk_1.Jwk {
         });
     }
     static fromPublicKey(publicKey) {
-        const expanded = (0, ecCompression_1.expand)(publicKey, jwa_1.JwaCurve.P521);
-        const x = expanded.slice(0, expanded.length / 2);
-        const y = expanded.slice(expanded.length / 2);
-        return new P521Jwk({
-            x: utils_1.TypedArrayEncoder.toBase64URL(x),
-            y: utils_1.TypedArrayEncoder.toBase64URL(y),
-        });
+        if ((0, ec_compression_1.isValidCompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp521r1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromCompressedPoint(publicKey, ec_compression_1.Secp521r1);
+            return new P521Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        if ((0, ec_compression_1.isValidDecompressedPublicKeyFormat)(publicKey, ec_compression_1.Secp521r1)) {
+            const affinePoint = ec_compression_1.AffinePoint.fromDecompressedPoint(publicKey, ec_compression_1.Secp521r1);
+            return new P521Jwk({ x: affinePoint.xBytes, y: affinePoint.yBytes });
+        }
+        throw new error_1.CredoError(`${this.keyType} public key is neither a valid compressed or uncompressed key. Key prefix '${publicKey[0]}', key length '${publicKey.length}'`);
     }
 }
 exports.P521Jwk = P521Jwk;

package/build/crypto/jose/jwk/P521Jwk.js.map

@@ -1 +1 @@
-{"version":3,"file":"P521Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/P521Jwk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"P521Jwk.js","sourceRoot":"","sources":["../../../../src/crypto/jose/jwk/P521Jwk.ts"],"names":[],"mappings":"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"}