jose 3.19.0 → 3.20.3

package/dist/node/cjs/lib/encrypt_key_management.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const random_js_1 = require("../runtime/random.js");
 const aeskw_js_1 = require("../runtime/aeskw.js");
 const ECDH = require("../runtime/ecdhes.js");
 const pbes2kw_js_1 = require("../runtime/pbes2kw.js");
@@ -9,9 +8,8 @@ const aesgcmkw_js_1 = require("../runtime/aesgcmkw.js");
 const base64url_js_1 = require("../runtime/base64url.js");
 const cek_js_1 = require("../lib/cek.js");
 const errors_js_1 = require("../util/errors.js");
-const from_key_like_js_1 = require("../jwk/from_key_like.js");
+const export_js_1 = require("../key/export.js");
 const check_key_type_js_1 = require("./check_key_type.js");
-const generateCek = (0, cek_js_1.default)(random_js_1.default);
 async function encryptKeyManagement(alg, enc, key, providedCek, providedParameters = {}) {
     let encryptedKey;
     let parameters;
@@ -32,7 +30,7 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
             const { apu, apv } = providedParameters;
             let { epk: ephemeralKey } = providedParameters;
             ephemeralKey || (ephemeralKey = await ECDH.generateEpk(key));
-            const { x, y, crv, kty } = await (0, from_key_like_js_1.fromKeyLike)(ephemeralKey);
+            const { x, y, crv, kty } = await (0, export_js_1.exportJWK)(ephemeralKey);
             const sharedSecret = await ECDH.deriveKey(key, ephemeralKey, alg === 'ECDH-ES' ? enc : alg, parseInt(alg.substr(-5, 3), 10) || cek_js_1.bitLengths.get(enc), apu, apv);
             parameters = { epk: { x, y, crv, kty } };
             if (apu)
@@ -43,7 +41,7 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
                 cek = sharedSecret;
                 break;
             }
-            cek = providedCek || generateCek(enc);
+            cek = providedCek || (0, cek_js_1.default)(enc);
             const kwAlg = alg.substr(-6);
             encryptedKey = await (0, aeskw_js_1.wrap)(kwAlg, sharedSecret, cek);
             break;
@@ -53,14 +51,14 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
         case 'RSA-OAEP-256':
         case 'RSA-OAEP-384':
         case 'RSA-OAEP-512': {
-            cek = providedCek || generateCek(enc);
+            cek = providedCek || (0, cek_js_1.default)(enc);
             encryptedKey = await (0, rsaes_js_1.encrypt)(alg, key, cek);
             break;
         }
         case 'PBES2-HS256+A128KW':
         case 'PBES2-HS384+A192KW':
         case 'PBES2-HS512+A256KW': {
-            cek = providedCek || generateCek(enc);
+            cek = providedCek || (0, cek_js_1.default)(enc);
             const { p2c, p2s } = providedParameters;
             ({ encryptedKey, ...parameters } = await (0, pbes2kw_js_1.encrypt)(alg, key, cek, p2c, p2s));
             break;
@@ -68,14 +66,14 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
         case 'A128KW':
         case 'A192KW':
         case 'A256KW': {
-            cek = providedCek || generateCek(enc);
+            cek = providedCek || (0, cek_js_1.default)(enc);
             encryptedKey = await (0, aeskw_js_1.wrap)(alg, key, cek);
             break;
         }
         case 'A128GCMKW':
         case 'A192GCMKW':
         case 'A256GCMKW': {
-            cek = providedCek || generateCek(enc);
+            cek = providedCek || (0, cek_js_1.default)(enc);
             const { iv } = providedParameters;
             ({ encryptedKey, ...parameters } = await (0, aesgcmkw_js_1.wrap)(alg, key, cek, iv));
             break;

package/dist/node/cjs/lib/iv.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bitLengths = void 0;
 const errors_js_1 = require("../util/errors.js");
+const random_js_1 = require("../runtime/random.js");
 const bitLengths = new Map([
     ['A128CBC-HS256', 128],
     ['A128GCM', 96],
@@ -14,11 +15,11 @@ const bitLengths = new Map([
     ['A256GCMKW', 96],
 ]);
 exports.bitLengths = bitLengths;
-const factory = (random) => (alg) => {
+const generateIv = (alg) => {
     const bitLength = bitLengths.get(alg);
     if (!bitLength) {
         throw new errors_js_1.JOSENotSupported(`Unsupported JWE Algorithm: ${alg}`);
     }
-    return random(new Uint8Array(bitLength >> 3));
+    return (0, random_js_1.default)(new Uint8Array(bitLength >> 3));
 };
-exports.default = factory;
+exports.default = generateIv;

package/dist/node/cjs/runtime/aesgcmkw.js

@@ -4,12 +4,10 @@ exports.unwrap = exports.wrap = void 0;
 const encrypt_js_1 = require("./encrypt.js");
 const decrypt_js_1 = require("./decrypt.js");
 const iv_js_1 = require("../lib/iv.js");
-const random_js_1 = require("./random.js");
 const base64url_js_1 = require("./base64url.js");
-const generateIv = (0, iv_js_1.default)(random_js_1.default);
 const wrap = async (alg, key, cek, iv) => {
     const jweAlgorithm = alg.substr(0, 7);
-    iv || (iv = generateIv(jweAlgorithm));
+    iv || (iv = (0, iv_js_1.default)(jweAlgorithm));
     const { ciphertext: encryptedKey, tag } = await (0, encrypt_js_1.default)(jweAlgorithm, cek, key, iv, new Uint8Array(0));
     return { encryptedKey, iv: (0, base64url_js_1.encode)(iv), tag: (0, base64url_js_1.encode)(tag) };
 };

package/dist/node/cjs/runtime/fetch_jwks.js

@@ -18,7 +18,11 @@ const fetchJwks = async (url, timeout, options) => {
         agent,
         timeout,
     });
-    const [response] = await (0, events_1.once)(req, 'response');
+    const [response] = (await Promise.race([(0, events_1.once)(req, 'response'), (0, events_1.once)(req, 'timeout')]));
+    if (!response) {
+        req.destroy();
+        throw new errors_js_1.JWKSTimeout();
+    }
     if (response.statusCode !== 200) {
         throw new errors_js_1.JOSEError('Expected 200 OK from the JSON Web Key Set HTTP response');
     }

package/dist/node/cjs/runtime/is_key_like.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.types = void 0;
+const webcrypto_js_1 = require("./webcrypto.js");
+const is_key_object_js_1 = require("./is_key_object.js");
+exports.default = (key) => (0, is_key_object_js_1.default)(key) || (0, webcrypto_js_1.isCryptoKey)(key);
+const types = ['KeyObject'];
+exports.types = types;
+if (parseInt(process.versions.node) >= 16) {
+    types.push('CryptoKey');
+}

package/dist/node/cjs/runtime/random.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const crypto_1 = require("crypto");
-exports.default = crypto_1.randomFillSync;
+exports.default = void 0;
+var crypto_1 = require("crypto");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return crypto_1.randomFillSync; } });

package/dist/node/cjs/util/errors.js

@@ -1,125 +1,165 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JWTExpired = exports.JWSSignatureVerificationFailed = exports.JWKSMultipleMatchingKeys = exports.JWKSNoMatchingKey = exports.JWKSInvalid = exports.JWKInvalid = exports.JWTInvalid = exports.JWSInvalid = exports.JWEInvalid = exports.JWEDecryptionFailed = exports.JOSENotSupported = exports.JOSEAlgNotAllowed = exports.JWTClaimValidationFailed = exports.JOSEError = void 0;
+exports.JWSSignatureVerificationFailed = exports.JWKSTimeout = exports.JWKSMultipleMatchingKeys = exports.JWKSNoMatchingKey = exports.JWKSInvalid = exports.JWKInvalid = exports.JWTInvalid = exports.JWSInvalid = exports.JWEInvalid = exports.JWEDecryptionFailed = exports.JOSENotSupported = exports.JOSEAlgNotAllowed = exports.JWTExpired = exports.JWTClaimValidationFailed = exports.JOSEError = void 0;
 class JOSEError extends Error {
     constructor(message) {
+        var _a;
         super(message);
-        this.code = JOSEError.code;
+        this.code = 'ERR_JOSE_GENERIC';
         this.name = this.constructor.name;
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, this.constructor);
-        }
+        (_a = Error.captureStackTrace) === null || _a === void 0 ? void 0 : _a.call(Error, this, this.constructor);
+    }
+    static get code() {
+        return 'ERR_JOSE_GENERIC';
     }
 }
 exports.JOSEError = JOSEError;
-JOSEError.code = 'ERR_JOSE_GENERIC';
 class JWTClaimValidationFailed extends JOSEError {
     constructor(message, claim = 'unspecified', reason = 'unspecified') {
         super(message);
-        this.code = JWTClaimValidationFailed.code;
+        this.code = 'ERR_JWT_CLAIM_VALIDATION_FAILED';
         this.claim = claim;
         this.reason = reason;
     }
+    static get code() {
+        return 'ERR_JWT_CLAIM_VALIDATION_FAILED';
+    }
 }
 exports.JWTClaimValidationFailed = JWTClaimValidationFailed;
-JWTClaimValidationFailed.code = 'ERR_JWT_CLAIM_VALIDATION_FAILED';
+class JWTExpired extends JOSEError {
+    constructor(message, claim = 'unspecified', reason = 'unspecified') {
+        super(message);
+        this.code = 'ERR_JWT_EXPIRED';
+        this.claim = claim;
+        this.reason = reason;
+    }
+    static get code() {
+        return 'ERR_JWT_EXPIRED';
+    }
+}
+exports.JWTExpired = JWTExpired;
 class JOSEAlgNotAllowed extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JOSEAlgNotAllowed.code;
+        this.code = 'ERR_JOSE_ALG_NOT_ALLOWED';
+    }
+    static get code() {
+        return 'ERR_JOSE_ALG_NOT_ALLOWED';
     }
 }
 exports.JOSEAlgNotAllowed = JOSEAlgNotAllowed;
-JOSEAlgNotAllowed.code = 'ERR_JOSE_ALG_NOT_ALLOWED';
 class JOSENotSupported extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JOSENotSupported.code;
+        this.code = 'ERR_JOSE_NOT_SUPPORTED';
+    }
+    static get code() {
+        return 'ERR_JOSE_NOT_SUPPORTED';
     }
 }
 exports.JOSENotSupported = JOSENotSupported;
-JOSENotSupported.code = 'ERR_JOSE_NOT_SUPPORTED';
 class JWEDecryptionFailed extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWEDecryptionFailed.code;
+        this.code = 'ERR_JWE_DECRYPTION_FAILED';
         this.message = 'decryption operation failed';
     }
+    static get code() {
+        return 'ERR_JWE_DECRYPTION_FAILED';
+    }
 }
 exports.JWEDecryptionFailed = JWEDecryptionFailed;
-JWEDecryptionFailed.code = 'ERR_JWE_DECRYPTION_FAILED';
 class JWEInvalid extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWEInvalid.code;
+        this.code = 'ERR_JWE_INVALID';
+    }
+    static get code() {
+        return 'ERR_JWE_INVALID';
     }
 }
 exports.JWEInvalid = JWEInvalid;
-JWEInvalid.code = 'ERR_JWE_INVALID';
 class JWSInvalid extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWSInvalid.code;
+        this.code = 'ERR_JWS_INVALID';
+    }
+    static get code() {
+        return 'ERR_JWS_INVALID';
     }
 }
 exports.JWSInvalid = JWSInvalid;
-JWSInvalid.code = 'ERR_JWS_INVALID';
 class JWTInvalid extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWTInvalid.code;
+        this.code = 'ERR_JWT_INVALID';
+    }
+    static get code() {
+        return 'ERR_JWT_INVALID';
     }
 }
 exports.JWTInvalid = JWTInvalid;
-JWTInvalid.code = 'ERR_JWT_INVALID';
 class JWKInvalid extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWKInvalid.code;
+        this.code = 'ERR_JWK_INVALID';
+    }
+    static get code() {
+        return 'ERR_JWK_INVALID';
     }
 }
 exports.JWKInvalid = JWKInvalid;
-JWKInvalid.code = 'ERR_JWK_INVALID';
 class JWKSInvalid extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWKSInvalid.code;
+        this.code = 'ERR_JWKS_INVALID';
+    }
+    static get code() {
+        return 'ERR_JWKS_INVALID';
     }
 }
 exports.JWKSInvalid = JWKSInvalid;
-JWKSInvalid.code = 'ERR_JWKS_INVALID';
 class JWKSNoMatchingKey extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWKSNoMatchingKey.code;
+        this.code = 'ERR_JWKS_NO_MATCHING_KEY';
         this.message = 'no applicable key found in the JSON Web Key Set';
     }
+    static get code() {
+        return 'ERR_JWKS_NO_MATCHING_KEY';
+    }
 }
 exports.JWKSNoMatchingKey = JWKSNoMatchingKey;
-JWKSNoMatchingKey.code = 'ERR_JWKS_NO_MATCHING_KEY';
 class JWKSMultipleMatchingKeys extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWKSMultipleMatchingKeys.code;
+        this.code = 'ERR_JWKS_MULTIPLE_MATCHING_KEYS';
         this.message = 'multiple matching keys found in the JSON Web Key Set';
     }
+    static get code() {
+        return 'ERR_JWKS_MULTIPLE_MATCHING_KEYS';
+    }
 }
 exports.JWKSMultipleMatchingKeys = JWKSMultipleMatchingKeys;
-JWKSMultipleMatchingKeys.code = 'ERR_JWKS_MULTIPLE_MATCHING_KEYS';
-class JWSSignatureVerificationFailed extends JOSEError {
+class JWKSTimeout extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWSSignatureVerificationFailed.code;
-        this.message = 'signature verification failed';
+        this.code = 'ERR_JWKS_TIMEOUT';
+        this.message = 'request timed out';
+    }
+    static get code() {
+        return 'ERR_JWKS_TIMEOUT';
     }
 }
-exports.JWSSignatureVerificationFailed = JWSSignatureVerificationFailed;
-JWSSignatureVerificationFailed.code = 'ERR_JWS_SIGNATURE_VERIFICATION_FAILED';
-class JWTExpired extends JWTClaimValidationFailed {
+exports.JWKSTimeout = JWKSTimeout;
+class JWSSignatureVerificationFailed extends JOSEError {
     constructor() {
         super(...arguments);
-        this.code = JWTExpired.code;
+        this.code = 'ERR_JWS_SIGNATURE_VERIFICATION_FAILED';
+        this.message = 'signature verification failed';
+    }
+    static get code() {
+        return 'ERR_JWS_SIGNATURE_VERIFICATION_FAILED';
     }
 }
-exports.JWTExpired = JWTExpired;
-JWTExpired.code = 'ERR_JWT_EXPIRED';
+exports.JWSSignatureVerificationFailed = JWSSignatureVerificationFailed;

package/dist/node/esm/jwe/flattened/decrypt.js

@@ -1,19 +1,14 @@
 import { decode as base64url } from '../../runtime/base64url.js';
 import decrypt from '../../runtime/decrypt.js';
 import { inflate } from '../../runtime/zlib.js';
-import random from '../../runtime/random.js';
 import { JOSEAlgNotAllowed, JOSENotSupported, JWEInvalid } from '../../util/errors.js';
 import isDisjoint from '../../lib/is_disjoint.js';
 import isObject from '../../lib/is_object.js';
 import decryptKeyManagement from '../../lib/decrypt_key_management.js';
 import { encoder, decoder, concat } from '../../lib/buffer_utils.js';
-import cekFactory from '../../lib/cek.js';
+import generateCek from '../../lib/cek.js';
 import validateCrit from '../../lib/validate_crit.js';
 import validateAlgorithms from '../../lib/validate_algorithms.js';
-const generateCek = cekFactory(random);
-const checkExtensions = validateCrit.bind(undefined, JWEInvalid, new Map());
-const checkAlgOption = validateAlgorithms.bind(undefined, 'keyManagementAlgorithms');
-const checkEncOption = validateAlgorithms.bind(undefined, 'contentEncryptionAlgorithms');
 async function flattenedDecrypt(jwe, key, options) {
     var _a;
     if (!isObject(jwe)) {
@@ -64,7 +59,7 @@ async function flattenedDecrypt(jwe, key, options) {
         ...jwe.header,
         ...jwe.unprotected,
     };
-    checkExtensions(options === null || options === void 0 ? void 0 : options.crit, parsedProt, joseHeader);
+    validateCrit(JWEInvalid, new Map(), options === null || options === void 0 ? void 0 : options.crit, parsedProt, joseHeader);
     if (joseHeader.zip !== undefined) {
         if (!parsedProt || !parsedProt.zip) {
             throw new JWEInvalid('JWE "zip" (Compression Algorithm) Header MUST be integrity protected');
@@ -80,8 +75,9 @@ async function flattenedDecrypt(jwe, key, options) {
     if (typeof enc !== 'string' || !enc) {
         throw new JWEInvalid('missing JWE Encryption Algorithm (enc) in JWE Header');
     }
-    const keyManagementAlgorithms = options && checkAlgOption(options.keyManagementAlgorithms);
-    const contentEncryptionAlgorithms = options && checkEncOption(options.contentEncryptionAlgorithms);
+    const keyManagementAlgorithms = options && validateAlgorithms('keyManagementAlgorithms', options.keyManagementAlgorithms);
+    const contentEncryptionAlgorithms = options &&
+        validateAlgorithms('contentEncryptionAlgorithms', options.contentEncryptionAlgorithms);
     if (keyManagementAlgorithms && !keyManagementAlgorithms.has(alg)) {
         throw new JOSEAlgNotAllowed('"alg" (Algorithm) Header Parameter not allowed');
     }

package/dist/node/esm/jwe/flattened/encrypt.js

@@ -1,15 +1,12 @@
 import { encode as base64url } from '../../runtime/base64url.js';
-import random from '../../runtime/random.js';
 import encrypt from '../../runtime/encrypt.js';
 import { deflate } from '../../runtime/zlib.js';
-import ivFactory from '../../lib/iv.js';
+import generateIv from '../../lib/iv.js';
 import encryptKeyManagement from '../../lib/encrypt_key_management.js';
 import { JOSENotSupported, JWEInvalid } from '../../util/errors.js';
 import isDisjoint from '../../lib/is_disjoint.js';
 import { encoder, decoder, concat } from '../../lib/buffer_utils.js';
 import validateCrit from '../../lib/validate_crit.js';
-const generateIv = ivFactory(random);
-const checkExtensions = validateCrit.bind(undefined, JWEInvalid, new Map());
 class FlattenedEncrypt {
     constructor(plaintext) {
         if (!(plaintext instanceof Uint8Array)) {
@@ -75,7 +72,7 @@ class FlattenedEncrypt {
             ...this._unprotectedHeader,
             ...this._sharedUnprotectedHeader,
         };
-        checkExtensions(options === null || options === void 0 ? void 0 : options.crit, this._protectedHeader, joseHeader);
+        validateCrit(JWEInvalid, new Map(), options === null || options === void 0 ? void 0 : options.crit, this._protectedHeader, joseHeader);
         if (joseHeader.zip !== undefined) {
             if (!this._protectedHeader || !this._protectedHeader.zip) {
                 throw new JWEInvalid('JWE "zip" (Compression Algorithm) Header MUST be integrity protected');

package/dist/node/esm/jwk/embedded.js

@@ -9,8 +9,8 @@ async function EmbeddedJWK(protectedHeader, token) {
     if (!isObject(joseHeader.jwk)) {
         throw new JWSInvalid('"jwk" (JSON Web Key) Header Parameter must be a JSON object');
     }
-    const key = (await importJWK({ ...joseHeader.jwk, ext: true }, joseHeader.alg, true));
-    if (key.type !== 'public') {
+    const key = await importJWK({ ...joseHeader.jwk, ext: true }, joseHeader.alg, true);
+    if (key instanceof Uint8Array || key.type !== 'public') {
         throw new JWSInvalid('"jwk" (JSON Web Key) Header Parameter must be a public key');
     }
     return key;

package/dist/node/esm/jwks/remote.js

@@ -1,9 +1,9 @@
 import fetchJwks from '../runtime/fetch_jwks.js';
-import parseJWK from '../jwk/parse.js';
+import { importJWK } from '../key/import.js';
 import { JWKSInvalid, JOSENotSupported, JWKSNoMatchingKey, JWKSMultipleMatchingKeys, } from '../util/errors.js';
 import isObject from '../lib/is_object.js';
 function getKtyFromAlg(alg) {
-    switch (alg.substr(0, 2)) {
+    switch (typeof alg === 'string' && alg.substr(0, 2)) {
         case 'RS':
         case 'PS':
             return 'RSA';
@@ -32,7 +32,7 @@ class RemoteJWKSet {
             typeof (options === null || options === void 0 ? void 0 : options.cooldownDuration) === 'number' ? options === null || options === void 0 ? void 0 : options.cooldownDuration : 30000;
     }
     coolingDown() {
-        if (typeof this._cooldownStarted === 'undefined') {
+        if (!this._cooldownStarted) {
             return false;
         }
         return Date.now() < this._cooldownStarted + this._cooldownDuration;
@@ -56,7 +56,7 @@ class RemoteJWKSet {
                 candidate = jwk.key_ops.includes('verify');
             }
             if (candidate && protectedHeader.alg === 'EdDSA') {
-                candidate = ['Ed25519', 'Ed448'].includes(jwk.crv);
+                candidate = jwk.crv === 'Ed25519' || jwk.crv === 'Ed448';
             }
             if (candidate) {
                 switch (protectedHeader.alg) {
@@ -88,13 +88,10 @@ class RemoteJWKSet {
         else if (length !== 1) {
             throw new JWKSMultipleMatchingKeys();
         }
-        if (!this._cached.has(jwk)) {
-            this._cached.set(jwk, {});
-        }
-        const cached = this._cached.get(jwk);
+        const cached = this._cached.get(jwk) || this._cached.set(jwk, {}).get(jwk);
         if (cached[protectedHeader.alg] === undefined) {
-            const keyObject = (await parseJWK({ ...jwk, alg: protectedHeader.alg, ext: true }));
-            if (keyObject.type !== 'public') {
+            const keyObject = await importJWK({ ...jwk, ext: true }, protectedHeader.alg);
+            if (keyObject instanceof Uint8Array || keyObject.type !== 'public') {
                 throw new JWKSInvalid('JSON Web Key Set members must be public keys');
             }
             cached[protectedHeader.alg] = keyObject;

package/dist/node/esm/jws/flattened/sign.js

@@ -5,7 +5,6 @@ import { JWSInvalid } from '../../util/errors.js';
 import { encoder, decoder, concat } from '../../lib/buffer_utils.js';
 import checkKeyType from '../../lib/check_key_type.js';
 import validateCrit from '../../lib/validate_crit.js';
-const checkExtensions = validateCrit.bind(undefined, JWSInvalid, new Map([['b64', true]]));
 class FlattenedSign {
     constructor(payload) {
         if (!(payload instanceof Uint8Array)) {
@@ -38,7 +37,7 @@ class FlattenedSign {
             ...this._protectedHeader,
             ...this._unprotectedHeader,
         };
-        const extensions = checkExtensions(options === null || options === void 0 ? void 0 : options.crit, this._protectedHeader, joseHeader);
+        const extensions = validateCrit(JWSInvalid, new Map([['b64', true]]), options === null || options === void 0 ? void 0 : options.crit, this._protectedHeader, joseHeader);
         let b64 = true;
         if (extensions.has('b64')) {
             b64 = this._protectedHeader.b64;

package/dist/node/esm/jws/flattened/verify.js

@@ -7,8 +7,6 @@ import isObject from '../../lib/is_object.js';
 import checkKeyType from '../../lib/check_key_type.js';
 import validateCrit from '../../lib/validate_crit.js';
 import validateAlgorithms from '../../lib/validate_algorithms.js';
-const checkExtensions = validateCrit.bind(undefined, JWSInvalid, new Map([['b64', true]]));
-const checkAlgOption = validateAlgorithms.bind(undefined, 'algorithms');
 async function flattenedVerify(jws, key, options) {
     var _a;
     if (!isObject(jws)) {
@@ -46,7 +44,7 @@ async function flattenedVerify(jws, key, options) {
         ...parsedProt,
         ...jws.header,
     };
-    const extensions = checkExtensions(options === null || options === void 0 ? void 0 : options.crit, parsedProt, joseHeader);
+    const extensions = validateCrit(JWSInvalid, new Map([['b64', true]]), options === null || options === void 0 ? void 0 : options.crit, parsedProt, joseHeader);
     let b64 = true;
     if (extensions.has('b64')) {
         b64 = parsedProt.b64;
@@ -58,7 +56,7 @@ async function flattenedVerify(jws, key, options) {
     if (typeof alg !== 'string' || !alg) {
         throw new JWSInvalid('JWS "alg" (Algorithm) Header Parameter missing or invalid');
     }
-    const algorithms = options && checkAlgOption(options.algorithms);
+    const algorithms = options && validateAlgorithms('algorithms', options.algorithms);
     if (algorithms && !algorithms.has(alg)) {
         throw new JOSEAlgNotAllowed('"alg" (Algorithm) Header Parameter not allowed');
     }

package/dist/node/esm/jwt/encrypt.js

@@ -1,6 +1,6 @@
 import CompactEncrypt from '../jwe/compact/encrypt.js';
 import { encoder } from '../lib/buffer_utils.js';
-import ProduceJWT from '../lib/jwt_producer.js';
+import { ProduceJWT } from './produce.js';
 class EncryptJWT extends ProduceJWT {
     setProtectedHeader(protectedHeader) {
         if (this._protectedHeader) {

package/dist/node/esm/{lib/jwt_producer.js → jwt/produce.js}

@@ -1,7 +1,7 @@
-import epoch from './epoch.js';
-import isObject from './is_object.js';
-import secs from './secs.js';
-export default class ProduceJWT {
+import epoch from '../lib/epoch.js';
+import isObject from '../lib/is_object.js';
+import secs from '../lib/secs.js';
+export class ProduceJWT {
     constructor(payload) {
         if (!isObject(payload)) {
             throw new TypeError('JWT Claims Set MUST be an object');

package/dist/node/esm/jwt/sign.js

@@ -1,7 +1,7 @@
 import CompactSign from '../jws/compact/sign.js';
 import { JWTInvalid } from '../util/errors.js';
 import { encoder } from '../lib/buffer_utils.js';
-import ProduceJWT from '../lib/jwt_producer.js';
+import { ProduceJWT } from './produce.js';
 class SignJWT extends ProduceJWT {
     setProtectedHeader(protectedHeader) {
         this._protectedHeader = protectedHeader;

package/dist/node/esm/jwt/unsecured.js

@@ -2,7 +2,7 @@ import * as base64url from '../runtime/base64url.js';
 import { decoder } from '../lib/buffer_utils.js';
 import { JWTInvalid } from '../util/errors.js';
 import jwtPayload from '../lib/jwt_claims_set.js';
-import ProduceJWT from '../lib/jwt_producer.js';
+import { ProduceJWT } from './produce.js';
 class UnsecuredJWT extends ProduceJWT {
     encode() {
         const header = base64url.encode(JSON.stringify({ alg: 'none' }));

package/dist/node/esm/lib/cek.js

@@ -1,4 +1,5 @@
 import { JOSENotSupported } from '../util/errors.js';
+import random from '../runtime/random.js';
 const bitLengths = new Map([
     ['A128CBC-HS256', 256],
     ['A128GCM', 128],
@@ -7,12 +8,12 @@ const bitLengths = new Map([
     ['A256CBC-HS512', 512],
     ['A256GCM', 256],
 ]);
-const factory = (random) => (alg) => {
+const generateCek = (alg) => {
     const bitLength = bitLengths.get(alg);
     if (!bitLength) {
         throw new JOSENotSupported(`Unsupported JWE Algorithm: ${alg}`);
     }
     return random(new Uint8Array(bitLength >> 3));
 };
-export default factory;
+export default generateCek;
 export { bitLengths };

package/dist/node/esm/lib/check_key_type.js

@@ -1,28 +1,45 @@
 import invalidKeyInput from '../runtime/invalid_key_input.js';
-const checkKeyType = (alg, key, usage) => {
-    if (!(key instanceof Uint8Array) && !(key === null || key === void 0 ? void 0 : key.type)) {
-        throw new TypeError(invalidKeyInput(key, 'KeyObject', 'CryptoKey', 'Uint8Array'));
+import isKeyLike, { types } from '../runtime/is_key_like.js';
+const symmetricTypeCheck = (key) => {
+    if (key instanceof Uint8Array)
+        return;
+    if (!isKeyLike(key)) {
+        throw new TypeError(invalidKeyInput(key, ...types, 'Uint8Array'));
     }
-    if (alg.startsWith('HS') ||
-        alg === 'dir' ||
-        alg.startsWith('PBES2') ||
-        alg.match(/^A\d{3}(?:GCM)?KW$/)) {
-        if (key instanceof Uint8Array || key.type === 'secret') {
-            return;
-        }
-        throw new TypeError('CryptoKey or KeyObject instances for symmetric algorithms must be of type "secret"');
+    if (key.type !== 'secret') {
+        throw new TypeError(`${types.join(' or ')} instances for symmetric algorithms must be of type "secret"`);
     }
-    if (key instanceof Uint8Array) {
-        throw new TypeError(invalidKeyInput(key, 'KeyObject', 'CryptoKey'));
+};
+const asymmetricTypeCheck = (key, usage) => {
+    if (!isKeyLike(key)) {
+        throw new TypeError(invalidKeyInput(key, ...types));
     }
     if (key.type === 'secret') {
-        throw new TypeError('CryptoKey or KeyObject instances for asymmetric algorithms must not be of type "secret"');
+        throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithms must not be of type "secret"`);
     }
     if (usage === 'sign' && key.type === 'public') {
-        throw new TypeError('CryptoKey or KeyObject instances for asymmetric algorithm signing must be of type "private"');
+        throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithm signing must be of type "private"`);
     }
     if (usage === 'decrypt' && key.type === 'public') {
-        throw new TypeError('CryptoKey or KeyObject instances for asymmetric algorithm decryption must be of type "private"');
+        throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithm decryption must be of type "private"`);
+    }
+    if (key.algorithm && usage === 'verify' && key.type === 'private') {
+        throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithm verifying must be of type "public"`);
+    }
+    if (key.algorithm && usage === 'encrypt' && key.type === 'private') {
+        throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithm encryption must be of type "public"`);
+    }
+};
+const checkKeyType = (alg, key, usage) => {
+    const symmetric = alg.startsWith('HS') ||
+        alg === 'dir' ||
+        alg.startsWith('PBES2') ||
+        /^A\d{3}(?:GCM)?KW$/.test(alg);
+    if (symmetric) {
+        symmetricTypeCheck(key);
+    }
+    else {
+        asymmetricTypeCheck(key, usage);
     }
 };
 export default checkKeyType;