jose 5.6.0 → 5.6.2

package/dist/browser/jwks/remote.js

@@ -10,7 +10,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.6.0';
+    const VERSION = 'v5.6.2';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 export const experimental_jwksCache = Symbol();

package/dist/browser/lib/decrypt_key_management.js

@@ -3,7 +3,7 @@ import * as ECDH from '../runtime/ecdhes.js';
 import { decrypt as pbes2Kw } from '../runtime/pbes2kw.js';
 import { decrypt as rsaEs } from '../runtime/rsaes.js';
 import { decode as base64url } from '../runtime/base64url.js';
-import * as normalize from '../runtime/normalize_key.js';
+import normalize from '../runtime/normalize_key.js';
 import { JOSENotSupported, JWEInvalid } from '../util/errors.js';
 import { bitLength as cekLength } from '../lib/cek.js';
 import { importJWK } from '../key/import.js';
@@ -11,10 +11,8 @@ import checkKeyType from './check_key_type.js';
 import isObject from './is_object.js';
 import { unwrap as aesGcmKw } from './aesgcmkw.js';
 async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
-    if (normalize.normalizePrivateKey) {
-        key = await normalize.normalizePrivateKey(key, alg);
-    }
     checkKeyType(alg, key, 'decrypt');
+    key = (await normalize.normalizePrivateKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             if (encryptedKey !== undefined)

package/dist/browser/lib/encrypt_key_management.js

@@ -3,7 +3,7 @@ import * as ECDH from '../runtime/ecdhes.js';
 import { encrypt as pbes2Kw } from '../runtime/pbes2kw.js';
 import { encrypt as rsaEs } from '../runtime/rsaes.js';
 import { encode as base64url } from '../runtime/base64url.js';
-import * as normalize from '../runtime/normalize_key.js';
+import normalize from '../runtime/normalize_key.js';
 import generateCek, { bitLength as cekLength } from '../lib/cek.js';
 import { JOSENotSupported } from '../util/errors.js';
 import { exportJWK } from '../key/export.js';
@@ -13,10 +13,8 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
     let encryptedKey;
     let parameters;
     let cek;
-    if (normalize.normalizePublicKey) {
-        key = await normalize.normalizePublicKey(key, alg);
-    }
     checkKeyType(alg, key, 'encrypt');
+    key = (await normalize.normalizePublicKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             cek = key;

package/dist/browser/runtime/get_sign_verify_key.js

@@ -2,12 +2,12 @@ import crypto, { isCryptoKey } from './webcrypto.js';
 import { checkSigCryptoKey } from '../lib/crypto_key.js';
 import invalidKeyInput from '../lib/invalid_key_input.js';
 import { types } from './is_key_like.js';
-import * as normalize from './normalize_key.js';
+import normalize from './normalize_key.js';
 export default async function getCryptoKey(alg, key, usage) {
-    if (normalize.normalizePrivateKey && usage === 'sign') {
+    if (usage === 'sign') {
         key = await normalize.normalizePrivateKey(key, alg);
     }
-    if (normalize.normalizePublicKey && usage === 'verify') {
+    if (usage === 'verify') {
         key = await normalize.normalizePublicKey(key, alg);
     }
     if (isCryptoKey(key)) {

package/dist/browser/runtime/normalize_key.js

@@ -1,8 +1,27 @@
 import { decode } from './base64url.js';
 import importJWK from './jwk_to_key.js';
 const normalizeSecretKey = (k) => decode(k);
-export const normalizePublicKey = async (key, alg) => {
-    if (key?.[Symbol.toStringTag] === 'KeyObject') {
+let privCache;
+let pubCache;
+const isKeyObject = (key) => {
+    return key?.[Symbol.toStringTag] === 'KeyObject';
+};
+const importAndCache = async (cache, key, jwk, alg) => {
+    let cached = cache.get(key);
+    if (cached?.[alg]) {
+        return cached[alg];
+    }
+    const cryptoKey = await importJWK({ ...jwk, alg });
+    if (!cached) {
+        cache.set(key, { [alg]: cryptoKey });
+    }
+    else {
+        cached[alg] = cryptoKey;
+    }
+    return cryptoKey;
+};
+const normalizePublicKey = (key, alg) => {
+    if (isKeyObject(key)) {
         let jwk = key.export({ format: 'jwk' });
         delete jwk.d;
         delete jwk.dp;
@@ -13,17 +32,20 @@ export const normalizePublicKey = async (key, alg) => {
         if (jwk.k) {
             return normalizeSecretKey(jwk.k);
         }
-        return importJWK({ ...jwk, alg });
+        pubCache || (pubCache = new WeakMap());
+        return importAndCache(pubCache, key, jwk, alg);
     }
     return key;
 };
-export const normalizePrivateKey = async (key, alg) => {
-    if (key?.[Symbol.toStringTag] === 'KeyObject') {
+const normalizePrivateKey = (key, alg) => {
+    if (isKeyObject(key)) {
         let jwk = key.export({ format: 'jwk' });
         if (jwk.k) {
             return normalizeSecretKey(jwk.k);
         }
-        return importJWK({ ...jwk, alg });
+        privCache || (privCache = new WeakMap());
+        return importAndCache(privCache, key, jwk, alg);
     }
     return key;
 };
+export default { normalizePublicKey, normalizePrivateKey };

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

@@ -13,7 +13,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.6.0';
+    const VERSION = 'v5.6.2';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 exports.experimental_jwksCache = Symbol();

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

@@ -5,7 +5,7 @@ const ECDH = require("../runtime/ecdhes.js");
 const pbes2kw_js_1 = require("../runtime/pbes2kw.js");
 const rsaes_js_1 = require("../runtime/rsaes.js");
 const base64url_js_1 = require("../runtime/base64url.js");
-const normalize = require("../runtime/normalize_key.js");
+const normalize_key_js_1 = require("../runtime/normalize_key.js");
 const errors_js_1 = require("../util/errors.js");
 const cek_js_1 = require("../lib/cek.js");
 const import_js_1 = require("../key/import.js");
@@ -13,10 +13,8 @@ const check_key_type_js_1 = require("./check_key_type.js");
 const is_object_js_1 = require("./is_object.js");
 const aesgcmkw_js_1 = require("./aesgcmkw.js");
 async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
-    if (normalize.normalizePrivateKey) {
-        key = await normalize.normalizePrivateKey(key, alg);
-    }
     (0, check_key_type_js_1.default)(alg, key, 'decrypt');
+    key = (await normalize_key_js_1.default.normalizePrivateKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             if (encryptedKey !== undefined)

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

@@ -5,7 +5,7 @@ const ECDH = require("../runtime/ecdhes.js");
 const pbes2kw_js_1 = require("../runtime/pbes2kw.js");
 const rsaes_js_1 = require("../runtime/rsaes.js");
 const base64url_js_1 = require("../runtime/base64url.js");
-const normalize = require("../runtime/normalize_key.js");
+const normalize_key_js_1 = require("../runtime/normalize_key.js");
 const cek_js_1 = require("../lib/cek.js");
 const errors_js_1 = require("../util/errors.js");
 const export_js_1 = require("../key/export.js");
@@ -15,10 +15,8 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
     let encryptedKey;
     let parameters;
     let cek;
-    if (normalize.normalizePublicKey) {
-        key = await normalize.normalizePublicKey(key, alg);
-    }
     (0, check_key_type_js_1.default)(alg, key, 'encrypt');
+    key = (await normalize_key_js_1.default.normalizePublicKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             cek = key;

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

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {};

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

@@ -10,7 +10,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.6.0';
+    const VERSION = 'v5.6.2';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 export const experimental_jwksCache = Symbol();

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

@@ -3,7 +3,7 @@ import * as ECDH from '../runtime/ecdhes.js';
 import { decrypt as pbes2Kw } from '../runtime/pbes2kw.js';
 import { decrypt as rsaEs } from '../runtime/rsaes.js';
 import { decode as base64url } from '../runtime/base64url.js';
-import * as normalize from '../runtime/normalize_key.js';
+import normalize from '../runtime/normalize_key.js';
 import { JOSENotSupported, JWEInvalid } from '../util/errors.js';
 import { bitLength as cekLength } from '../lib/cek.js';
 import { importJWK } from '../key/import.js';
@@ -11,10 +11,8 @@ import checkKeyType from './check_key_type.js';
 import isObject from './is_object.js';
 import { unwrap as aesGcmKw } from './aesgcmkw.js';
 async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
-    if (normalize.normalizePrivateKey) {
-        key = await normalize.normalizePrivateKey(key, alg);
-    }
     checkKeyType(alg, key, 'decrypt');
+    key = (await normalize.normalizePrivateKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             if (encryptedKey !== undefined)

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

@@ -3,7 +3,7 @@ import * as ECDH from '../runtime/ecdhes.js';
 import { encrypt as pbes2Kw } from '../runtime/pbes2kw.js';
 import { encrypt as rsaEs } from '../runtime/rsaes.js';
 import { encode as base64url } from '../runtime/base64url.js';
-import * as normalize from '../runtime/normalize_key.js';
+import normalize from '../runtime/normalize_key.js';
 import generateCek, { bitLength as cekLength } from '../lib/cek.js';
 import { JOSENotSupported } from '../util/errors.js';
 import { exportJWK } from '../key/export.js';
@@ -13,10 +13,8 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
     let encryptedKey;
     let parameters;
     let cek;
-    if (normalize.normalizePublicKey) {
-        key = await normalize.normalizePublicKey(key, alg);
-    }
     checkKeyType(alg, key, 'encrypt');
+    key = (await normalize.normalizePublicKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             cek = key;

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

@@ -1 +1 @@
-export {};
+export default {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "5.6.0",
+  "version": "5.6.2",
   "description": "JWA, JWS, JWE, JWT, JWK, JWKS for Node.js, Browser, Cloudflare Workers, Deno, Bun, and other Web-interoperable runtimes",
   "keywords": [
     "browser",