@zuplo/cli 6.74.2 → 6.74.6

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/key.js

@@ -7,17 +7,7 @@ const tag = (key) => key[Symbol.toStringTag];
 const jwkMatchesOp = (entry, key, usage) => {
     const { alg } = entry;
     if (key.use !== undefined) {
-        let expected;
-        switch (usage) {
-            case 'sign':
-            case 'verify':
-                expected = 'sig';
-                break;
-            case 'encrypt':
-            case 'decrypt':
-                expected = 'enc';
-                break;
-        }
+        const expected = usage === 'sign' || usage === 'verify' ? 'sig' : 'enc';
         if (key.use !== expected) {
             throw new TypeError(`Invalid key for this operation, its "use" must be "${expected}" when present`);
         }
@@ -26,79 +16,56 @@ const jwkMatchesOp = (entry, key, usage) => {
         throw new TypeError(`Invalid key for this operation, its "alg" must be "${alg}" when present`);
     }
     if (Array.isArray(key.key_ops)) {
-        const expectedKeyOp = usage === 'encrypt' || usage === 'decrypt' ? entry.keyOps?.[usage] : usage;
-        if (expectedKeyOp && key.key_ops?.includes?.(expectedKeyOp) === false) {
+        const expectedKeyOp = usage === 'encrypt' || usage === 'decrypt' ? entry.ops?.[usage === 'encrypt' ? 0 : 1] : usage;
+        if (expectedKeyOp && !key.key_ops.includes(expectedKeyOp)) {
             throw new TypeError(`Invalid key for this operation, its "key_ops" must include "${expectedKeyOp}" when present`);
         }
     }
-    return true;
-};
-const symmetricTypeCheck = (entry, key, usage) => {
-    const { alg } = entry;
-    if (key instanceof Uint8Array)
-        return { kind: BYTES, key };
-    if (jwk.isJWK(key)) {
-        if (jwk.isSecretJWK(key) && jwkMatchesOp(entry, key, usage))
-            return { kind: JWK, key };
-        throw new TypeError(`JSON Web Key for symmetric algorithms must have JWK "kty" (Key Type) equal to "oct" and the JWK "k" (Key Value) present`);
-    }
-    if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(alg, key, 'CryptoKey', 'KeyObject', 'JSON Web Key', 'Uint8Array'));
-    }
-    if (key.type !== 'secret') {
-        throw new TypeError(`${tag(key)} instances for symmetric algorithms must be of type "secret"`);
-    }
-    return isCryptoKey(key) ? { kind: CRYPTO, key } : { kind: KEYOBJECT, key };
 };
-const asymmetricTypeCheck = (entry, key, usage) => {
-    const { alg } = entry;
+export function checkKeyType(entry, key, usage) {
+    const { alg, secret } = entry;
+    const privateKey = usage === 'decrypt' || usage === 'sign';
+    if (secret && key instanceof Uint8Array)
+        return [BYTES, key];
     if (jwk.isJWK(key)) {
-        switch (usage) {
-            case 'decrypt':
-            case 'sign':
-                if (jwk.isPrivateJWK(key) && jwkMatchesOp(entry, key, usage))
-                    return { kind: JWK, key };
-                throw new TypeError(`JSON Web Key for this operation must be a private JWK`);
-            case 'encrypt':
-            case 'verify':
-                if (jwk.isPublicJWK(key) && jwkMatchesOp(entry, key, usage))
-                    return { kind: JWK, key };
-                throw new TypeError(`JSON Web Key for this operation must be a public JWK`);
+        if (secret ? !jwk.isSecretJWK(key) : !(privateKey ? jwk.isPrivateJWK(key) : jwk.isPublicJWK(key))) {
+            throw new TypeError(secret
+                ? `JSON Web Key for symmetric algorithms must have JWK "kty" (Key Type) equal to "oct" and the JWK "k" (Key Value) present`
+                : `JSON Web Key for this operation must be a ${privateKey ? 'private' : 'public'} JWK`);
         }
+        jwkMatchesOp(entry, key, usage);
+        return [JWK, key];
     }
     if (!isKeyLike(key)) {
-        throw new TypeError(invalidKeyInput(alg, key, 'CryptoKey', 'KeyObject', 'JSON Web Key'));
-    }
-    if (key.type === 'secret') {
-        throw new TypeError(`${tag(key)} instances for asymmetric algorithms must not be of type "secret"`);
+        throw new TypeError(secret
+            ? invalidKeyInput(alg, key, 'CryptoKey', 'KeyObject', 'JSON Web Key', 'Uint8Array')
+            : invalidKeyInput(alg, key, 'CryptoKey', 'KeyObject', 'JSON Web Key'));
     }
-    if (key.type === 'public') {
-        switch (usage) {
-            case 'sign':
-                throw new TypeError(`${tag(key)} instances for asymmetric algorithm signing must be of type "private"`);
-            case 'decrypt':
-                throw new TypeError(`${tag(key)} instances for asymmetric algorithm decryption must be of type "private"`);
+    if (secret) {
+        if (key.type !== 'secret') {
+            throw new TypeError(`${tag(key)} instances for symmetric algorithms must be of type "secret"`);
         }
     }
-    if (key.type === 'private') {
-        switch (usage) {
-            case 'verify':
-                throw new TypeError(`${tag(key)} instances for asymmetric algorithm verifying must be of type "public"`);
-            case 'encrypt':
-                throw new TypeError(`${tag(key)} instances for asymmetric algorithm encryption must be of type "public"`);
+    else {
+        if (key.type === 'secret') {
+            throw new TypeError(`${tag(key)} instances for asymmetric algorithms must not be of type "secret"`);
+        }
+        const expectedType = privateKey ? 'private' : 'public';
+        if ((key.type === 'public' || key.type === 'private') && key.type !== expectedType) {
+            const operation = usage === 'sign'
+                ? 'signing'
+                : usage === 'verify'
+                    ? 'verifying'
+                    : `${usage.slice(0, -1)}tion`;
+            throw new TypeError(`${tag(key)} instances for asymmetric algorithm ${operation} must be of type "${expectedType}"`);
         }
     }
-    return isCryptoKey(key) ? { kind: CRYPTO, key } : { kind: KEYOBJECT, key };
-};
-const BYTES = Symbol();
-const CRYPTO = Symbol();
-const KEYOBJECT = Symbol();
-const JWK = Symbol();
-export function checkKeyType(entry, key, usage) {
-    return entry.symmetric
-        ? symmetricTypeCheck(entry, key, usage)
-        : asymmetricTypeCheck(entry, key, usage);
+    return isCryptoKey(key) ? [CRYPTO, key] : [KEYOBJECT, key];
 }
+const BYTES = 0;
+const CRYPTO = 1;
+const KEYOBJECT = 2;
+const JWK = 3;
 let cache;
 const nist = {
     __proto__: null,
@@ -106,58 +73,53 @@ const nist = {
     secp384r1: 'P-384',
     secp521r1: 'P-521',
 };
-function cached(key, alg) {
+function cached(key, alg, value) {
     cache ||= new WeakMap();
-    return cache.get(key)?.[alg];
-}
-function store(key, alg, cryptoKey) {
     const entry = cache.get(key);
-    if (entry) {
-        entry[alg] = cryptoKey;
-    }
-    else {
-        cache.set(key, { [alg]: cryptoKey });
+    if (value) {
+        if (entry) {
+            entry[alg] = value;
+        }
+        else {
+            cache.set(key, { [alg]: value });
+        }
     }
-    return cryptoKey;
+    return value ?? entry?.[alg];
 }
-const handleJWK = async (key, jwk, entry) => {
-    const hit = cached(key, entry.alg);
-    if (hit)
-        return hit;
-    const cryptoKey = await jwkToKey(entry, { ...jwk, alg: entry.alg });
-    return store(key, entry.alg, cryptoKey);
-};
+const handleJWK = async (key, jwk, entry) => cached(key, entry.alg) ??
+    cached(key, entry.alg, await jwkToKey(entry, { ...jwk, alg: entry.alg }));
 const handleKeyObject = (keyObject, entry) => {
     const hit = cached(keyObject, entry.alg);
     if (hit)
         return hit;
     const isPublic = keyObject.type === 'public';
-    const usages = isPublic ? entry.usages.public : entry.usages.private;
+    const usages = entry.usages[isPublic ? 0 : 1];
     const { asymmetricKeyType } = keyObject;
     const crv = nist[keyObject.asymmetricKeyDetails?.namedCurve];
-    const params = entry.subtleFor?.({ crv, asymmetricKeyType }) ?? entry.subtle;
-    return store(keyObject, entry.alg, keyObject.toCryptoKey(params, isPublic, usages));
+    const params = entry.resolve?.({ crv, asymmetricKeyType }) ?? entry.subtle;
+    return cached(keyObject, entry.alg, keyObject.toCryptoKey(params, isPublic, usages));
 };
 export async function prepareKey(entry, key, usage) {
     const tagged = checkKeyType(entry, key, usage);
-    switch (tagged.kind) {
+    switch (tagged[0]) {
         case BYTES:
         case CRYPTO:
-            return tagged.key;
+            return tagged[1];
         case JWK: {
-            if (tagged.key.k) {
-                return decode(tagged.key.k);
+            const key = tagged[1];
+            if (key.k) {
+                return decode(key.k);
             }
-            if (!Object.isFrozen(tagged.key)) {
-                const { key_ops } = tagged.key;
+            if (!Object.isFrozen(key)) {
+                const { key_ops } = key;
                 if (Array.isArray(key_ops))
                     Object.freeze(key_ops);
-                Object.freeze(tagged.key);
+                Object.freeze(key);
             }
-            return handleJWK(tagged.key, tagged.key, entry);
+            return handleJWK(key, key, entry);
         }
         case KEYOBJECT: {
-            const keyObject = tagged.key;
+            const keyObject = tagged[1];
             if (keyObject.type === 'secret') {
                 return keyObject.export();
             }

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/key_algorithm.js

@@ -1,16 +1,10 @@
 import { JOSENotSupported } from '../util/errors.js';
 import { maybeJWSAlgorithm } from './jws_algorithms.js';
 import { maybeJWEAlgorithm } from './jwe_algorithms.js';
-function unsupportedAlgorithm() {
-    return new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
-}
 export function keyAlgorithm(alg) {
-    if (typeof alg !== 'string') {
-        throw unsupportedAlgorithm();
-    }
-    const entry = maybeJWSAlgorithm(alg) ?? maybeJWEAlgorithm(alg);
+    const entry = typeof alg === 'string' ? (maybeJWSAlgorithm(alg) ?? maybeJWEAlgorithm(alg)) : undefined;
     if (!entry) {
-        throw unsupportedAlgorithm();
+        throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
     }
     return entry;
 }

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/key_descriptor.js

@@ -1,6 +1,6 @@
 export function table(entries) {
     const out = { __proto__: null };
-    for (const alg of Object.keys(entries)) {
+    for (const alg in entries) {
         out[alg] = { ...entries[alg], alg };
     }
     return out;

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/key_management.js

@@ -6,75 +6,38 @@ import { JOSENotSupported, JWEInvalid } from '../util/errors.js';
 import { decodeBase64url, digest } from './helpers.js';
 import { generateCek, encrypt, decrypt } from './content_encryption.js';
 import { isObject } from './type_checks.js';
-import { checkCryptoKey, checkUsage } from './crypto_key.js';
-import { checkModulusLength } from './signing.js';
+import { checkCryptoKey, checkModulusLength, checkUsage } from './crypto_key.js';
 import { concat, encode, uint32be } from './buffer_utils.js';
 import { assertCryptoKey } from './is_key_like.js';
 function checkEcdhCryptoKey(key, usage) {
-    switch (key.algorithm.name) {
-        case 'ECDH':
-        case 'X25519':
-            break;
-        default:
-            throw new TypeError('CryptoKey does not support this operation, its algorithm.name must be ECDH or X25519');
+    if (key.algorithm.name !== 'ECDH' && key.algorithm.name !== 'X25519') {
+        throw new TypeError('CryptoKey does not support this operation, its algorithm.name must be ECDH or X25519');
     }
     checkUsage(key, usage);
 }
-function checkKeySize(key, alg) {
-    if (key.algorithm.length !== parseInt(alg.slice(1, 4), 10)) {
-        throw new TypeError(`Invalid key size for alg: ${alg}`);
-    }
-}
-function aeskwCryptoKey(key, alg, usage) {
-    if (key instanceof Uint8Array) {
-        return crypto.subtle.importKey('raw', key, 'AES-KW', true, [usage]);
-    }
-    checkCryptoKey(key, jweAlgorithm(alg).subtle, usage);
-    return key;
+async function aeskwCryptoKey(key, alg, usage) {
+    const expected = jweAlgorithm(alg).subtle;
+    const cryptoKey = key instanceof Uint8Array
+        ? await crypto.subtle.importKey('raw', key, 'AES-KW', true, [
+            usage,
+        ])
+        : key;
+    checkCryptoKey(cryptoKey, expected, usage);
+    return cryptoKey;
 }
 async function aeskwWrap(alg, key, cek) {
     const cryptoKey = await aeskwCryptoKey(key, alg, 'wrapKey');
-    checkKeySize(cryptoKey, alg);
     const cryptoKeyCek = await crypto.subtle.importKey('raw', cek, { hash: 'SHA-256', name: 'HMAC' }, true, ['sign']);
     return new Uint8Array(await crypto.subtle.wrapKey('raw', cryptoKeyCek, cryptoKey, 'AES-KW'));
 }
 async function aeskwUnwrap(alg, key, encryptedKey) {
     const cryptoKey = await aeskwCryptoKey(key, alg, 'unwrapKey');
-    checkKeySize(cryptoKey, alg);
     const cryptoKeyCek = await crypto.subtle.unwrapKey('raw', encryptedKey, cryptoKey, 'AES-KW', { hash: 'SHA-256', name: 'HMAC' }, true, ['sign']);
     return new Uint8Array(await crypto.subtle.exportKey('raw', cryptoKeyCek));
 }
-async function aesGcmKwWrap(gcm, key, cek, iv) {
-    const wrapped = await encrypt(gcm, cek, key, iv, new Uint8Array());
-    return {
-        encryptedKey: wrapped.ciphertext,
-        iv: b64u(wrapped.iv),
-        tag: b64u(wrapped.tag),
-    };
-}
-async function aesGcmKwUnwrap(gcm, key, encryptedKey, iv, tag) {
-    return decrypt(gcm, key, encryptedKey, iv, tag, new Uint8Array());
-}
-const subtleAlgorithm = (alg) => {
-    switch (alg) {
-        case 'RSA-OAEP':
-        case 'RSA-OAEP-256':
-        case 'RSA-OAEP-384':
-        case 'RSA-OAEP-512':
-            return 'RSA-OAEP';
-        default:
-            throw new JOSENotSupported(`alg ${alg} is not supported either by JOSE or your javascript runtime`);
-    }
-};
-async function rsaesEncrypt(alg, key, cek) {
-    checkCryptoKey(key, jweAlgorithm(alg).subtle, 'encrypt');
-    checkModulusLength(alg, key);
-    return new Uint8Array(await crypto.subtle.encrypt(subtleAlgorithm(alg), key, cek));
-}
-async function rsaesDecrypt(alg, key, encryptedKey) {
-    checkCryptoKey(key, jweAlgorithm(alg).subtle, 'decrypt');
+function checkRsaKey(alg, key, usage) {
+    checkCryptoKey(key, jweAlgorithm(alg).subtle, usage);
     checkModulusLength(alg, key);
-    return new Uint8Array(await crypto.subtle.decrypt(subtleAlgorithm(alg), key, encryptedKey));
 }
 function pbes2CryptoKey(key, alg) {
     if (key instanceof Uint8Array) {
@@ -85,7 +48,6 @@ function pbes2CryptoKey(key, alg) {
     checkCryptoKey(key, jweAlgorithm(alg).subtle, 'deriveBits');
     return key;
 }
-const concatSalt = (alg, p2sInput) => concat(encode(alg), Uint8Array.of(0x00), p2sInput);
 async function deriveKey(p2s, alg, p2c, key) {
     if (!(p2s instanceof Uint8Array) || p2s.length < 8) {
         throw new JWEInvalid('PBES2 Salt Input must be 8 or more octets');
@@ -93,7 +55,7 @@ async function deriveKey(p2s, alg, p2c, key) {
     if (!Number.isSafeInteger(p2c) || Math.sign(p2c) !== 1) {
         throw new JWEInvalid('PBES2 Count Input must be a positive integer');
     }
-    const salt = concatSalt(alg, p2s);
+    const salt = concat(encode(alg), Uint8Array.of(0), p2s);
     const keylen = parseInt(alg.slice(13, 16), 10);
     const subtleAlg = {
         hash: `SHA-${alg.slice(8, 11)}`,
@@ -104,15 +66,6 @@ async function deriveKey(p2s, alg, p2c, key) {
     const cryptoKey = await pbes2CryptoKey(key, alg);
     return new Uint8Array(await crypto.subtle.deriveBits(subtleAlg, cryptoKey, keylen));
 }
-async function pbes2kwWrap(alg, key, cek, p2c = 2048, p2s = crypto.getRandomValues(new Uint8Array(16))) {
-    const derived = await deriveKey(p2s, alg, p2c, key);
-    const encryptedKey = await aeskwWrap(alg.slice(-6), derived, cek);
-    return { encryptedKey, p2c, p2s: b64u(p2s) };
-}
-async function pbes2kwUnwrap(alg, key, encryptedKey, p2c, p2s) {
-    const derived = await deriveKey(p2s, alg, p2c, key);
-    return aeskwUnwrap(alg.slice(-6), derived, encryptedKey);
-}
 function lengthAndInput(input) {
     return concat(uint32be(input.length), input);
 }
@@ -122,11 +75,7 @@ async function concatKdf(Z, L, OtherInfo) {
     const reps = Math.ceil(dkLen / hashLen);
     const dk = new Uint8Array(reps * hashLen);
     for (let i = 1; i <= reps; i++) {
-        const hashInput = new Uint8Array(4 + Z.length + OtherInfo.length);
-        hashInput.set(uint32be(i), 0);
-        hashInput.set(Z, 4);
-        hashInput.set(OtherInfo, 4 + Z.length);
-        const hashResult = await digest('sha256', hashInput);
+        const hashResult = await digest('sha256', concat(uint32be(i), Z, OtherInfo));
         dk.set(hashResult, (i - 1) * hashLen);
     }
     return dk.slice(0, dkLen);
@@ -134,58 +83,47 @@ async function concatKdf(Z, L, OtherInfo) {
 async function ecdhesDeriveKey(publicKey, privateKey, algorithm, keyLength, apu = new Uint8Array(), apv = new Uint8Array()) {
     checkEcdhCryptoKey(publicKey);
     checkEcdhCryptoKey(privateKey, 'deriveBits');
-    const algorithmID = lengthAndInput(encode(algorithm));
-    const partyUInfo = lengthAndInput(apu);
-    const partyVInfo = lengthAndInput(apv);
-    const suppPubInfo = uint32be(keyLength);
-    const suppPrivInfo = new Uint8Array();
-    const otherInfo = concat(algorithmID, partyUInfo, partyVInfo, suppPubInfo, suppPrivInfo);
+    const otherInfo = concat(lengthAndInput(encode(algorithm)), lengthAndInput(apu), lengthAndInput(apv), uint32be(keyLength));
     const Z = new Uint8Array(await crypto.subtle.deriveBits({
         name: publicKey.algorithm.name,
         public: publicKey,
-    }, privateKey, getEcdhBitLength(publicKey)));
+    }, privateKey, publicKey.algorithm.name === 'X25519'
+        ? 256
+        : Math.ceil(parseInt(publicKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3));
     return concatKdf(Z, keyLength, otherInfo);
 }
-function getEcdhBitLength(publicKey) {
-    if (publicKey.algorithm.name === 'X25519') {
-        return 256;
-    }
-    return (Math.ceil(parseInt(publicKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3);
-}
-function ecdhesAllowed(key) {
-    switch (key.algorithm.namedCurve) {
-        case 'P-256':
-        case 'P-384':
-        case 'P-521':
-            return true;
-        default:
-            return key.algorithm.name === 'X25519';
+function assertEcdhKey(key) {
+    assertCryptoKey(key);
+    const curve = key.algorithm.namedCurve;
+    if (curve !== 'P-256' &&
+        curve !== 'P-384' &&
+        curve !== 'P-521' &&
+        key.algorithm.name !== 'X25519') {
+        throw new JOSENotSupported('ECDH with the provided key is not allowed or not supported by your javascript runtime');
     }
 }
-const unsupportedAlgHeader = 'Invalid or unsupported "alg" (JWE Algorithm) header value';
 function assertEncryptedKey(encryptedKey) {
     if (encryptedKey === undefined)
         throw new JWEInvalid('JWE Encrypted Key missing');
 }
+function assertNoEncryptedKey(encryptedKey) {
+    if (encryptedKey !== undefined)
+        throw new JWEInvalid('Encountered unexpected JWE Encrypted Key');
+}
 export async function decryptKeyManagement(alg, enc, key, encryptedKey, joseHeader, options) {
-    switch (alg) {
-        case 'dir': {
-            if (encryptedKey !== undefined)
-                throw new JWEInvalid('Encountered unexpected JWE Encrypted Key');
-            return key;
-        }
-        case 'ECDH-ES':
-            if (encryptedKey !== undefined)
-                throw new JWEInvalid('Encountered unexpected JWE Encrypted Key');
-        case 'ECDH-ES+A128KW':
-        case 'ECDH-ES+A192KW':
-        case 'ECDH-ES+A256KW': {
+    const entry = jweAlgorithm(alg);
+    if (alg === 'dir') {
+        assertNoEncryptedKey(encryptedKey);
+        return key;
+    }
+    switch (entry.subtle.name) {
+        case 'ECDH': {
+            if (alg === 'ECDH-ES')
+                assertNoEncryptedKey(encryptedKey);
             if (!isObject(joseHeader.epk))
                 throw new JWEInvalid(`JOSE Header "epk" (Ephemeral Public Key) missing or invalid`);
-            assertCryptoKey(key);
-            if (!ecdhesAllowed(key))
-                throw new JOSENotSupported('ECDH with the provided key is not allowed or not supported by your javascript runtime');
-            const epk = await jwkToKey(jweAlgorithm(alg), joseHeader.epk);
+            assertEcdhKey(key);
+            const epk = await jwkToKey(entry, joseHeader.epk);
             let partyUInfo;
             let partyVInfo;
             if (joseHeader.apu !== undefined) {
@@ -204,17 +142,13 @@ export async function decryptKeyManagement(alg, enc, key, encryptedKey, joseHead
             assertEncryptedKey(encryptedKey);
             return aeskwUnwrap(alg.slice(-6), sharedSecret, encryptedKey);
         }
-        case 'RSA-OAEP':
-        case 'RSA-OAEP-256':
-        case 'RSA-OAEP-384':
-        case 'RSA-OAEP-512': {
+        case 'RSA-OAEP': {
             assertEncryptedKey(encryptedKey);
             assertCryptoKey(key);
-            return rsaesDecrypt(alg, key, encryptedKey);
+            checkRsaKey(alg, key, 'decrypt');
+            return new Uint8Array(await crypto.subtle.decrypt('RSA-OAEP', key, encryptedKey));
         }
-        case 'PBES2-HS256+A128KW':
-        case 'PBES2-HS384+A192KW':
-        case 'PBES2-HS512+A256KW': {
+        case 'PBKDF2': {
             assertEncryptedKey(encryptedKey);
             if (typeof joseHeader.p2c !== 'number')
                 throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) missing or invalid`);
@@ -223,19 +157,15 @@ export async function decryptKeyManagement(alg, enc, key, encryptedKey, joseHead
                 throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) out is of acceptable bounds`);
             if (typeof joseHeader.p2s !== 'string')
                 throw new JWEInvalid(`JOSE Header "p2s" (PBES2 Salt) missing or invalid`);
-            let p2s;
-            p2s = decodeBase64url(joseHeader.p2s, 'p2s', JWEInvalid);
-            return pbes2kwUnwrap(alg, key, encryptedKey, joseHeader.p2c, p2s);
+            const p2s = decodeBase64url(joseHeader.p2s, 'p2s', JWEInvalid);
+            const derived = await deriveKey(p2s, alg, joseHeader.p2c, key);
+            return aeskwUnwrap(alg.slice(-6), derived, encryptedKey);
         }
-        case 'A128KW':
-        case 'A192KW':
-        case 'A256KW': {
+        case 'AES-KW': {
             assertEncryptedKey(encryptedKey);
             return aeskwUnwrap(alg, key, encryptedKey);
         }
-        case 'A128GCMKW':
-        case 'A192GCMKW':
-        case 'A256GCMKW': {
+        case 'AES-GCM': {
             assertEncryptedKey(encryptedKey);
             if (typeof joseHeader.iv !== 'string')
                 throw new JWEInvalid(`JOSE Header "iv" (Initialization Vector) missing or invalid`);
@@ -245,10 +175,7 @@ export async function decryptKeyManagement(alg, enc, key, encryptedKey, joseHead
             iv = decodeBase64url(joseHeader.iv, 'iv', JWEInvalid);
             let tag;
             tag = decodeBase64url(joseHeader.tag, 'tag', JWEInvalid);
-            return aesGcmKwUnwrap(jweEncryption(jweAlgorithm(alg).gcmkw), key, encryptedKey, iv, tag);
-        }
-        default: {
-            throw new JOSENotSupported(unsupportedAlgHeader);
+            return decrypt(jweEncryption(alg.slice(0, -2)), key, encryptedKey, iv, tag, new Uint8Array());
         }
     }
 }
@@ -256,23 +183,16 @@ export async function encryptKeyManagement(alg, enc, key, providedCek, providedP
     let encryptedKey;
     let parameters;
     let cek;
-    switch (alg) {
-        case 'dir': {
-            cek = key;
-            break;
-        }
-        case 'ECDH-ES':
-        case 'ECDH-ES+A128KW':
-        case 'ECDH-ES+A192KW':
-        case 'ECDH-ES+A256KW': {
-            assertCryptoKey(key);
-            if (!ecdhesAllowed(key)) {
-                throw new JOSENotSupported('ECDH with the provided key is not allowed or not supported by your javascript runtime');
-            }
+    const entry = jweAlgorithm(alg);
+    if (alg === 'dir')
+        return [key, undefined, undefined];
+    switch (entry.subtle.name) {
+        case 'ECDH': {
+            assertEcdhKey(key);
             const { apu, apv } = providedParameters;
             let ephemeralKey;
             if (providedParameters.epk) {
-                ephemeralKey = (await prepareKey(jweAlgorithm(alg), providedParameters.epk, 'decrypt'));
+                ephemeralKey = (await prepareKey(entry, providedParameters.epk, 'decrypt'));
             }
             else {
                 ephemeralKey = (await crypto.subtle.generateKey(key.algorithm, true, ['deriveBits'])).privateKey;
@@ -303,41 +223,34 @@ export async function encryptKeyManagement(alg, enc, key, providedCek, providedP
             encryptedKey = await aeskwWrap(kwAlg, sharedSecret, cek);
             break;
         }
-        case 'RSA-OAEP':
-        case 'RSA-OAEP-256':
-        case 'RSA-OAEP-384':
-        case 'RSA-OAEP-512': {
+        case 'RSA-OAEP': {
             cek = providedCek || generateCek(enc);
             assertCryptoKey(key);
-            encryptedKey = await rsaesEncrypt(alg, key, cek);
+            checkRsaKey(alg, key, 'encrypt');
+            encryptedKey = new Uint8Array(await crypto.subtle.encrypt('RSA-OAEP', key, cek));
             break;
         }
-        case 'PBES2-HS256+A128KW':
-        case 'PBES2-HS384+A192KW':
-        case 'PBES2-HS512+A256KW': {
+        case 'PBKDF2': {
             cek = providedCek || generateCek(enc);
-            const { p2c, p2s } = providedParameters;
-            ({ encryptedKey, ...parameters } = await pbes2kwWrap(alg, key, cek, p2c, p2s));
+            const { p2c = 2048, p2s = crypto.getRandomValues(new Uint8Array(16)) } = providedParameters;
+            const derived = await deriveKey(p2s, alg, p2c, key);
+            encryptedKey = await aeskwWrap(alg.slice(-6), derived, cek);
+            parameters = { p2c, p2s: b64u(p2s) };
             break;
         }
-        case 'A128KW':
-        case 'A192KW':
-        case 'A256KW': {
+        case 'AES-KW': {
             cek = providedCek || generateCek(enc);
             encryptedKey = await aeskwWrap(alg, key, cek);
             break;
         }
-        case 'A128GCMKW':
-        case 'A192GCMKW':
-        case 'A256GCMKW': {
+        case 'AES-GCM': {
             cek = providedCek || generateCek(enc);
             const { iv } = providedParameters;
-            ({ encryptedKey, ...parameters } = await aesGcmKwWrap(jweEncryption(jweAlgorithm(alg).gcmkw), key, cek, iv));
+            const wrapped = await encrypt(jweEncryption(alg.slice(0, -2)), cek, key, iv, new Uint8Array());
+            encryptedKey = wrapped.ciphertext;
+            parameters = { iv: b64u(wrapped.iv), tag: b64u(wrapped.tag) };
             break;
         }
-        default: {
-            throw new JOSENotSupported(unsupportedAlgHeader);
-        }
     }
-    return { cek, encryptedKey, parameters };
+    return [cek, encryptedKey, parameters];
 }