jose 4.9.2 → 4.10.0

package/README.md

@@ -1,6 +1,6 @@
 # jose
 
-> "JSON Web Almost Everything" - JWA, JWS, JWE, JWT, JWK, JWKS with no dependencies using runtime's native crypto in Node.js, Browser, Cloudflare Workers, Electron, and Deno.
+> "JSON Web Almost Everything" - JWA, JWS, JWE, JWT, JWK, JWKS for Node.js, Browser, Cloudflare Workers, Deno, and other Web-interoperable runtimes.
 
 ## Implemented specs & features
 
@@ -22,6 +22,8 @@ implementation is correct.
 
 ## [💗 Help the project](https://github.com/sponsors/panva)
 
+## Dependencies: 0
+
 ## Documentation
 
 **`example`** ESM import
@@ -100,7 +102,7 @@ import * as jose from 'https://deno.land/x/jose/index.ts'
 
 #### How is it different from [`jws`](https://github.com/brianloveswords/node-jws), [`jwa`](https://github.com/brianloveswords/node-jwa) or [`jsonwebtoken`](https://github.com/auth0/node-jsonwebtoken)?
 
-- it supports Browser, Cloudflare Workers, and Deno runtimes
+- it supports Browser, Deno, Cloudflare Workers, and other Web-interoperable runtimes
 - it supports encrypted JWTs (i.e. in JWE format)
 - supports secp256k1, Ed25519, Ed448, X25519, and X448
 - it supports JWK Key Format for all four key types (oct, RSA, EC and OKP)

package/dist/browser/key/import.js

@@ -33,18 +33,12 @@ function parseElement(bytes) {
         length = bytes[position];
         position++;
     }
-    else {
-        let numberOfDigits = bytes[position] & 0x7f;
-        position++;
-        length = 0;
-        for (let i = 0; i < numberOfDigits; i++) {
-            length = length * 256 + bytes[position];
-            position++;
-        }
-    }
-    if (length === 0x80) {
+    else if (length === 0x80) {
         length = 0;
         while (bytes[position + length] !== 0 || bytes[position + length + 1] !== 0) {
+            if (length > bytes.byteLength) {
+                throw new TypeError('invalid indefinite form length');
+            }
             length++;
         }
         const byteLength = position + length + 2;
@@ -54,6 +48,15 @@ function parseElement(bytes) {
             raw: bytes.subarray(0, byteLength),
         };
     }
+    else {
+        let numberOfDigits = bytes[position] & 0x7f;
+        position++;
+        length = 0;
+        for (let i = 0; i < numberOfDigits; i++) {
+            length = length * 256 + bytes[position];
+            position++;
+        }
+    }
     const byteLength = position + length;
     return {
         byteLength,
@@ -80,7 +83,13 @@ export async function importX509(x509, alg, options) {
     if (typeof x509 !== 'string' || x509.indexOf('-----BEGIN CERTIFICATE-----') !== 0) {
         throw new TypeError('"x509" must be X.509 formatted string');
     }
-    const spki = getSPKI(x509);
+    let spki;
+    try {
+        spki = getSPKI(x509);
+    }
+    catch (cause) {
+        throw new TypeError('failed to parse the X.509 certificate', { cause });
+    }
     return importPublic(spki, alg, options);
 }
 export async function importPKCS8(pkcs8, alg, options) {

package/dist/browser/lib/check_key_type.js

@@ -1,18 +1,18 @@
-import invalidKeyInput from './invalid_key_input.js';
+import { withAlg as invalidKeyInput } from './invalid_key_input.js';
 import isKeyLike, { types } from '../runtime/is_key_like.js';
-const symmetricTypeCheck = (key) => {
+const symmetricTypeCheck = (alg, key) => {
     if (key instanceof Uint8Array)
         return;
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types, 'Uint8Array'));
+        throw new TypeError(invalidKeyInput(alg, key, ...types, 'Uint8Array'));
     }
     if (key.type !== 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for symmetric algorithms must be of type "secret"`);
     }
 };
-const asymmetricTypeCheck = (key, usage) => {
+const asymmetricTypeCheck = (alg, key, usage) => {
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types));
+        throw new TypeError(invalidKeyInput(alg, key, ...types));
     }
     if (key.type === 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithms must not be of type "secret"`);
@@ -36,10 +36,10 @@ const checkKeyType = (alg, key, usage) => {
         alg.startsWith('PBES2') ||
         /^A\d{3}(?:GCM)?KW$/.test(alg);
     if (symmetric) {
-        symmetricTypeCheck(key);
+        symmetricTypeCheck(alg, key);
     }
     else {
-        asymmetricTypeCheck(key, usage);
+        asymmetricTypeCheck(alg, key, usage);
     }
 };
 export default checkKeyType;

package/dist/browser/lib/crypto_key.js

@@ -76,6 +76,12 @@ export function checkSigCryptoKey(key, alg, ...usages) {
                 throw unusable('NODE-ED25519');
             break;
         }
+        case 'EdDSA': {
+            if (key.algorithm.name !== 'Ed25519' && key.algorithm.name !== 'Ed448') {
+                throw unusable('Ed25519 or Ed448');
+            }
+            break;
+        }
         case 'ES256':
         case 'ES384':
         case 'ES512': {
@@ -116,10 +122,17 @@ export function checkEncCryptoKey(key, alg, ...usages) {
                 throw unusable(expected, 'algorithm.length');
             break;
         }
-        case 'ECDH':
-            if (!isAlgorithm(key.algorithm, 'ECDH'))
-                throw unusable('ECDH');
+        case 'ECDH': {
+            switch (key.algorithm.name) {
+                case 'ECDH':
+                case 'X25519':
+                case 'X448':
+                    break;
+                default:
+                    throw unusable('ECDH, X25519, or X448');
+            }
             break;
+        }
         case 'PBES2-HS256+A128KW':
         case 'PBES2-HS384+A192KW':
         case 'PBES2-HS512+A256KW':

package/dist/browser/lib/invalid_key_input.js

@@ -1,5 +1,4 @@
-export default (actual, ...types) => {
-    let msg = 'Key must be ';
+function message(msg, actual, ...types) {
     if (types.length > 2) {
         const last = types.pop();
         msg += `one of type ${types.join(', ')}, or ${last}.`;
@@ -22,4 +21,10 @@ export default (actual, ...types) => {
         }
     }
     return msg;
+}
+export default (actual, ...types) => {
+    return message('Key must be ', actual, ...types);
 };
+export function withAlg(alg, actual, ...types) {
+    return message(`Key for the ${alg} algorithm must be `, actual, ...types);
+}

package/dist/browser/runtime/asn1.js

@@ -44,8 +44,14 @@ const getNamedCurve = (keyData) => {
             return 'P-384';
         case findOid(keyData, [0x2b, 0x81, 0x04, 0x00, 0x23]):
             return 'P-521';
-        case isCloudflareWorkers() && findOid(keyData, [0x2b, 0x65, 0x70]):
+        case findOid(keyData, [0x2b, 0x65, 0x6e]):
+            return 'X25519';
+        case findOid(keyData, [0x2b, 0x65, 0x6f]):
+            return 'X448';
+        case findOid(keyData, [0x2b, 0x65, 0x70]):
             return 'Ed25519';
+        case findOid(keyData, [0x2b, 0x65, 0x71]):
+            return 'Ed448';
         default:
             throw new JOSENotSupported('Invalid or unsupported EC Key Curve or OKP Key Sub Type');
     }
@@ -96,15 +102,22 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
         case 'ECDH-ES':
         case 'ECDH-ES+A128KW':
         case 'ECDH-ES+A192KW':
-        case 'ECDH-ES+A256KW':
-            algorithm = { name: 'ECDH', namedCurve: getNamedCurve(keyData) };
+        case 'ECDH-ES+A256KW': {
+            const namedCurve = getNamedCurve(keyData);
+            algorithm = namedCurve.startsWith('P-') ? { name: 'ECDH', namedCurve } : { name: namedCurve };
             keyUsages = isPublic ? [] : ['deriveBits'];
             break;
-        case isCloudflareWorkers() && 'EdDSA':
+        }
+        case isCloudflareWorkers() && 'EdDSA': {
             const namedCurve = getNamedCurve(keyData).toUpperCase();
             algorithm = { name: `NODE-${namedCurve}`, namedCurve: `NODE-${namedCurve}` };
             keyUsages = isPublic ? ['verify'] : ['sign'];
             break;
+        }
+        case 'EdDSA':
+            algorithm = { name: getNamedCurve(keyData) };
+            keyUsages = isPublic ? ['verify'] : ['sign'];
+            break;
         default:
             throw new JOSENotSupported('Invalid or unsupported "alg" (Algorithm) value');
     }

package/dist/browser/runtime/check_cek_length.js

@@ -1,7 +1,8 @@
 import { JWEInvalid } from '../util/errors.js';
 const checkCekLength = (cek, expected) => {
-    if (cek.length << 3 !== expected) {
-        throw new JWEInvalid('Invalid Content Encryption Key length');
+    const actual = cek.byteLength << 3;
+    if (actual !== expected) {
+        throw new JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
     }
 };
 export default checkCekLength;

package/dist/browser/runtime/ecdhes.js

@@ -13,10 +13,21 @@ export async function deriveKey(publicKey, privateKey, algorithm, keyLength, apu
     }
     checkEncCryptoKey(privateKey, 'ECDH', 'deriveBits');
     const value = concat(lengthAndInput(encoder.encode(algorithm)), lengthAndInput(apu), lengthAndInput(apv), uint32be(keyLength));
+    let length;
+    if (publicKey.algorithm.name === 'X25519') {
+        length = 256;
+    }
+    else if (publicKey.algorithm.name === 'X448') {
+        length = 448;
+    }
+    else {
+        length =
+            Math.ceil(parseInt(publicKey.algorithm.namedCurve.substr(-3), 10) / 8) << 3;
+    }
     const sharedSecret = new Uint8Array(await crypto.subtle.deriveBits({
-        name: 'ECDH',
+        name: publicKey.algorithm.name,
         public: publicKey,
-    }, privateKey, Math.ceil(parseInt(privateKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3));
+    }, privateKey, length));
     return concatKdf(sharedSecret, keyLength, value);
 }
 export async function generateEpk(key) {
@@ -29,5 +40,7 @@ export function ecdhAllowed(key) {
     if (!isCryptoKey(key)) {
         throw new TypeError(invalidKeyInput(key, ...types));
     }
-    return ['P-256', 'P-384', 'P-521'].includes(key.algorithm.namedCurve);
+    return (['P-256', 'P-384', 'P-521'].includes(key.algorithm.namedCurve) ||
+        key.algorithm.name === 'X25519' ||
+        key.algorithm.name === 'X448');
 }

package/dist/browser/runtime/env.js

@@ -1,3 +1,5 @@
 export function isCloudflareWorkers() {
-    return typeof WebSocketPair === 'function';
+    return (typeof WebSocketPair !== 'undefined' ||
+        (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
+        (typeof EdgeRuntime !== 'undefined' && EdgeRuntime === 'vercel'));
 }

package/dist/browser/runtime/generate.js

@@ -51,7 +51,7 @@ function getModulusLengthOption(options) {
     return modulusLength;
 }
 export async function generateKeyPair(alg, options) {
-    var _a, _b;
+    var _a, _b, _c;
     let algorithm;
     let keyUsages;
     switch (alg) {
@@ -112,15 +112,42 @@ export async function generateKeyPair(alg, options) {
                     throw new JOSENotSupported('Invalid or unsupported crv option provided');
             }
             break;
+        case 'EdDSA':
+            keyUsages = ['sign', 'verify'];
+            const crv = (_a = options === null || options === void 0 ? void 0 : options.crv) !== null && _a !== void 0 ? _a : 'Ed25519';
+            switch (crv) {
+                case 'Ed25519':
+                case 'Ed448':
+                    algorithm = { name: crv };
+                    break;
+                default:
+                    throw new JOSENotSupported('Invalid or unsupported crv option provided');
+            }
+            break;
         case 'ECDH-ES':
         case 'ECDH-ES+A128KW':
         case 'ECDH-ES+A192KW':
-        case 'ECDH-ES+A256KW':
-            algorithm = { name: 'ECDH', namedCurve: (_a = options === null || options === void 0 ? void 0 : options.crv) !== null && _a !== void 0 ? _a : 'P-256' };
+        case 'ECDH-ES+A256KW': {
             keyUsages = ['deriveKey', 'deriveBits'];
+            const crv = (_b = options === null || options === void 0 ? void 0 : options.crv) !== null && _b !== void 0 ? _b : 'P-256';
+            switch (crv) {
+                case 'P-256':
+                case 'P-384':
+                case 'P-521': {
+                    algorithm = { name: 'ECDH', namedCurve: crv };
+                    break;
+                }
+                case 'X25519':
+                case 'X448':
+                    algorithm = { name: crv };
+                    break;
+                default:
+                    throw new JOSENotSupported('Invalid or unsupported crv option provided, supported values are P-256, P-384, P-521, X25519, and X448');
+            }
             break;
+        }
         default:
             throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
     }
-    return (crypto.subtle.generateKey(algorithm, (_b = options === null || options === void 0 ? void 0 : options.extractable) !== null && _b !== void 0 ? _b : false, keyUsages));
+    return (crypto.subtle.generateKey(algorithm, (_c = options === null || options === void 0 ? void 0 : options.extractable) !== null && _c !== void 0 ? _c : false, keyUsages));
 }

package/dist/browser/runtime/jwk_to_key.js

@@ -109,9 +109,27 @@ function subtleMapping(jwk) {
                     keyUsages = jwk.d ? ['sign'] : ['verify'];
                     break;
                 default:
-                    throw new JOSENotSupported('Invalid or unsupported JWK "crv" (Subtype of Key Pair) Parameter value');
+                    throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
             }
             break;
+        case 'OKP': {
+            switch (jwk.alg) {
+                case 'EdDSA':
+                    algorithm = { name: jwk.crv };
+                    keyUsages = jwk.d ? ['sign'] : ['verify'];
+                    break;
+                case 'ECDH-ES':
+                case 'ECDH-ES+A128KW':
+                case 'ECDH-ES+A192KW':
+                case 'ECDH-ES+A256KW':
+                    algorithm = { name: jwk.crv };
+                    keyUsages = jwk.d ? ['deriveBits'] : [];
+                    break;
+                default:
+                    throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+            }
+            break;
+        }
         default:
             throw new JOSENotSupported('Invalid or unsupported JWK "kty" (Key Type) Parameter value');
     }

package/dist/browser/runtime/subtle_dsa.js

@@ -22,6 +22,8 @@ export default function subtleDsa(alg, algorithm) {
         case isCloudflareWorkers() && 'EdDSA':
             const { namedCurve } = algorithm;
             return { name: namedCurve, namedCurve };
+        case 'EdDSA':
+            return { name: algorithm.name };
         default:
             throw new JOSENotSupported(`alg ${alg} is not supported either by JOSE or your javascript runtime`);
     }

package/dist/node/cjs/key/import.js

@@ -36,18 +36,12 @@ function parseElement(bytes) {
         length = bytes[position];
         position++;
     }
-    else {
-        let numberOfDigits = bytes[position] & 0x7f;
-        position++;
-        length = 0;
-        for (let i = 0; i < numberOfDigits; i++) {
-            length = length * 256 + bytes[position];
-            position++;
-        }
-    }
-    if (length === 0x80) {
+    else if (length === 0x80) {
         length = 0;
         while (bytes[position + length] !== 0 || bytes[position + length + 1] !== 0) {
+            if (length > bytes.byteLength) {
+                throw new TypeError('invalid indefinite form length');
+            }
             length++;
         }
         const byteLength = position + length + 2;
@@ -57,6 +51,15 @@ function parseElement(bytes) {
             raw: bytes.subarray(0, byteLength),
         };
     }
+    else {
+        let numberOfDigits = bytes[position] & 0x7f;
+        position++;
+        length = 0;
+        for (let i = 0; i < numberOfDigits; i++) {
+            length = length * 256 + bytes[position];
+            position++;
+        }
+    }
     const byteLength = position + length;
     return {
         byteLength,
@@ -84,7 +87,13 @@ async function importX509(x509, alg, options) {
     if (typeof x509 !== 'string' || x509.indexOf('-----BEGIN CERTIFICATE-----') !== 0) {
         throw new TypeError('"x509" must be X.509 formatted string');
     }
-    const spki = getSPKI(x509);
+    let spki;
+    try {
+        spki = getSPKI(x509);
+    }
+    catch (cause) {
+        throw new TypeError('failed to parse the X.509 certificate', { cause });
+    }
     return (0, asn1_js_1.fromSPKI)(spki, alg, options);
 }
 exports.importX509 = importX509;

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

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const invalid_key_input_js_1 = require("./invalid_key_input.js");
 const is_key_like_js_1 = require("../runtime/is_key_like.js");
-const symmetricTypeCheck = (key) => {
+const symmetricTypeCheck = (alg, key) => {
     if (key instanceof Uint8Array)
         return;
     if (!(0, is_key_like_js_1.default)(key)) {
-        throw new TypeError((0, invalid_key_input_js_1.default)(key, ...is_key_like_js_1.types, 'Uint8Array'));
+        throw new TypeError((0, invalid_key_input_js_1.withAlg)(alg, key, ...is_key_like_js_1.types, 'Uint8Array'));
     }
     if (key.type !== 'secret') {
         throw new TypeError(`${is_key_like_js_1.types.join(' or ')} instances for symmetric algorithms must be of type "secret"`);
     }
 };
-const asymmetricTypeCheck = (key, usage) => {
+const asymmetricTypeCheck = (alg, key, usage) => {
     if (!(0, is_key_like_js_1.default)(key)) {
-        throw new TypeError((0, invalid_key_input_js_1.default)(key, ...is_key_like_js_1.types));
+        throw new TypeError((0, invalid_key_input_js_1.withAlg)(alg, key, ...is_key_like_js_1.types));
     }
     if (key.type === 'secret') {
         throw new TypeError(`${is_key_like_js_1.types.join(' or ')} instances for asymmetric algorithms must not be of type "secret"`);
@@ -38,10 +38,10 @@ const checkKeyType = (alg, key, usage) => {
         alg.startsWith('PBES2') ||
         /^A\d{3}(?:GCM)?KW$/.test(alg);
     if (symmetric) {
-        symmetricTypeCheck(key);
+        symmetricTypeCheck(alg, key);
     }
     else {
-        asymmetricTypeCheck(key, usage);
+        asymmetricTypeCheck(alg, key, usage);
     }
 };
 exports.default = checkKeyType;

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

@@ -79,6 +79,12 @@ function checkSigCryptoKey(key, alg, ...usages) {
                 throw unusable('NODE-ED25519');
             break;
         }
+        case 'EdDSA': {
+            if (key.algorithm.name !== 'Ed25519' && key.algorithm.name !== 'Ed448') {
+                throw unusable('Ed25519 or Ed448');
+            }
+            break;
+        }
         case 'ES256':
         case 'ES384':
         case 'ES512': {
@@ -120,10 +126,17 @@ function checkEncCryptoKey(key, alg, ...usages) {
                 throw unusable(expected, 'algorithm.length');
             break;
         }
-        case 'ECDH':
-            if (!isAlgorithm(key.algorithm, 'ECDH'))
-                throw unusable('ECDH');
+        case 'ECDH': {
+            switch (key.algorithm.name) {
+                case 'ECDH':
+                case 'X25519':
+                case 'X448':
+                    break;
+                default:
+                    throw unusable('ECDH, X25519, or X448');
+            }
             break;
+        }
         case 'PBES2-HS256+A128KW':
         case 'PBES2-HS384+A192KW':
         case 'PBES2-HS512+A256KW':

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (actual, ...types) => {
-    let msg = 'Key must be ';
+exports.withAlg = void 0;
+function message(msg, actual, ...types) {
     if (types.length > 2) {
         const last = types.pop();
         msg += `one of type ${types.join(', ')}, or ${last}.`;
@@ -24,4 +24,11 @@ exports.default = (actual, ...types) => {
         }
     }
     return msg;
+}
+exports.default = (actual, ...types) => {
+    return message('Key must be ', actual, ...types);
 };
+function withAlg(alg, actual, ...types) {
+    return message(`Key for the ${alg} algorithm must be `, actual, ...types);
+}
+exports.withAlg = withAlg;

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

@@ -19,14 +19,16 @@ const checkCekLength = (enc, cek) => {
             throw new errors_js_1.JOSENotSupported(`Content Encryption Algorithm ${enc} is not supported either by JOSE or your javascript runtime`);
     }
     if (cek instanceof Uint8Array) {
-        if (cek.length << 3 !== expected) {
-            throw new errors_js_1.JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.byteLength << 3;
+        if (actual !== expected) {
+            throw new errors_js_1.JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }
     if ((0, is_key_object_js_1.default)(cek) && cek.type === 'secret') {
-        if (cek.symmetricKeySize << 3 !== expected) {
-            throw new errors_js_1.JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.symmetricKeySize << 3;
+        if (actual !== expected) {
+            throw new errors_js_1.JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }

package/dist/node/esm/key/import.js

@@ -33,18 +33,12 @@ function parseElement(bytes) {
         length = bytes[position];
         position++;
     }
-    else {
-        let numberOfDigits = bytes[position] & 0x7f;
-        position++;
-        length = 0;
-        for (let i = 0; i < numberOfDigits; i++) {
-            length = length * 256 + bytes[position];
-            position++;
-        }
-    }
-    if (length === 0x80) {
+    else if (length === 0x80) {
         length = 0;
         while (bytes[position + length] !== 0 || bytes[position + length + 1] !== 0) {
+            if (length > bytes.byteLength) {
+                throw new TypeError('invalid indefinite form length');
+            }
             length++;
         }
         const byteLength = position + length + 2;
@@ -54,6 +48,15 @@ function parseElement(bytes) {
             raw: bytes.subarray(0, byteLength),
         };
     }
+    else {
+        let numberOfDigits = bytes[position] & 0x7f;
+        position++;
+        length = 0;
+        for (let i = 0; i < numberOfDigits; i++) {
+            length = length * 256 + bytes[position];
+            position++;
+        }
+    }
     const byteLength = position + length;
     return {
         byteLength,
@@ -80,7 +83,13 @@ export async function importX509(x509, alg, options) {
     if (typeof x509 !== 'string' || x509.indexOf('-----BEGIN CERTIFICATE-----') !== 0) {
         throw new TypeError('"x509" must be X.509 formatted string');
     }
-    const spki = getSPKI(x509);
+    let spki;
+    try {
+        spki = getSPKI(x509);
+    }
+    catch (cause) {
+        throw new TypeError('failed to parse the X.509 certificate', { cause });
+    }
     return importPublic(spki, alg, options);
 }
 export async function importPKCS8(pkcs8, alg, options) {

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

@@ -1,18 +1,18 @@
-import invalidKeyInput from './invalid_key_input.js';
+import { withAlg as invalidKeyInput } from './invalid_key_input.js';
 import isKeyLike, { types } from '../runtime/is_key_like.js';
-const symmetricTypeCheck = (key) => {
+const symmetricTypeCheck = (alg, key) => {
     if (key instanceof Uint8Array)
         return;
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types, 'Uint8Array'));
+        throw new TypeError(invalidKeyInput(alg, key, ...types, 'Uint8Array'));
     }
     if (key.type !== 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for symmetric algorithms must be of type "secret"`);
     }
 };
-const asymmetricTypeCheck = (key, usage) => {
+const asymmetricTypeCheck = (alg, key, usage) => {
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(key, ...types));
+        throw new TypeError(invalidKeyInput(alg, key, ...types));
     }
     if (key.type === 'secret') {
         throw new TypeError(`${types.join(' or ')} instances for asymmetric algorithms must not be of type "secret"`);
@@ -36,10 +36,10 @@ const checkKeyType = (alg, key, usage) => {
         alg.startsWith('PBES2') ||
         /^A\d{3}(?:GCM)?KW$/.test(alg);
     if (symmetric) {
-        symmetricTypeCheck(key);
+        symmetricTypeCheck(alg, key);
     }
     else {
-        asymmetricTypeCheck(key, usage);
+        asymmetricTypeCheck(alg, key, usage);
     }
 };
 export default checkKeyType;

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

@@ -76,6 +76,12 @@ export function checkSigCryptoKey(key, alg, ...usages) {
                 throw unusable('NODE-ED25519');
             break;
         }
+        case 'EdDSA': {
+            if (key.algorithm.name !== 'Ed25519' && key.algorithm.name !== 'Ed448') {
+                throw unusable('Ed25519 or Ed448');
+            }
+            break;
+        }
         case 'ES256':
         case 'ES384':
         case 'ES512': {
@@ -116,10 +122,17 @@ export function checkEncCryptoKey(key, alg, ...usages) {
                 throw unusable(expected, 'algorithm.length');
             break;
         }
-        case 'ECDH':
-            if (!isAlgorithm(key.algorithm, 'ECDH'))
-                throw unusable('ECDH');
+        case 'ECDH': {
+            switch (key.algorithm.name) {
+                case 'ECDH':
+                case 'X25519':
+                case 'X448':
+                    break;
+                default:
+                    throw unusable('ECDH, X25519, or X448');
+            }
             break;
+        }
         case 'PBES2-HS256+A128KW':
         case 'PBES2-HS384+A192KW':
         case 'PBES2-HS512+A256KW':

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

@@ -1,5 +1,4 @@
-export default (actual, ...types) => {
-    let msg = 'Key must be ';
+function message(msg, actual, ...types) {
     if (types.length > 2) {
         const last = types.pop();
         msg += `one of type ${types.join(', ')}, or ${last}.`;
@@ -22,4 +21,10 @@ export default (actual, ...types) => {
         }
     }
     return msg;
+}
+export default (actual, ...types) => {
+    return message('Key must be ', actual, ...types);
 };
+export function withAlg(alg, actual, ...types) {
+    return message(`Key for the ${alg} algorithm must be `, actual, ...types);
+}

package/dist/node/esm/runtime/check_cek_length.js

@@ -17,14 +17,16 @@ const checkCekLength = (enc, cek) => {
             throw new JOSENotSupported(`Content Encryption Algorithm ${enc} is not supported either by JOSE or your javascript runtime`);
     }
     if (cek instanceof Uint8Array) {
-        if (cek.length << 3 !== expected) {
-            throw new JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.byteLength << 3;
+        if (actual !== expected) {
+            throw new JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }
     if (isKeyObject(cek) && cek.type === 'secret') {
-        if (cek.symmetricKeySize << 3 !== expected) {
-            throw new JWEInvalid('Invalid Content Encryption Key length');
+        const actual = cek.symmetricKeySize << 3;
+        if (actual !== expected) {
+            throw new JWEInvalid(`Invalid Content Encryption Key length. Expected ${expected} bits, got ${actual} bits`);
         }
         return;
     }

package/dist/types/types.d.ts

@@ -20,8 +20,8 @@
  * obtain a KeyObject from your existing key material.
  *
  * [CryptoKey](https://developer.mozilla.org/en-US/docs/Web/API/CryptoKey) is a representation of a
- * key/secret available in the Browser and Deno runtimes. In addition to the import functions of
- * this library you may use the
+ * key/secret available in the Browser and Web-interoperable runtimes. In addition to the import
+ * functions of this library you may use the
  * [SubtleCrypto.importKey](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey)
  * API to obtain a CryptoKey from your existing key material.
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jose",
-  "version": "4.9.2",
-  "description": "'JSON Web Almost Everything' - JWA, JWS, JWE, JWT, JWK, JWKS with no dependencies using runtime's native crypto",
+  "version": "4.10.0",
+  "description": "'JSON Web Almost Everything' - JWA, JWS, JWE, JWT, JWK, JWKS for Node.js, Browser, Cloudflare Workers, Deno, and other Web-interoperable runtimes",
   "keywords": [
     "browser",
     "cloudflare",