jose 5.2.2 → 5.2.3

package/dist/browser/jwe/flattened/encrypt.js

@@ -1,6 +1,5 @@
 import { encode as base64url } from '../../runtime/base64url.js';
 import encrypt from '../../runtime/encrypt.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';
@@ -84,15 +83,8 @@ export class FlattenedEncrypt {
             throw new JWEInvalid('JWE "enc" (Encryption Algorithm) Header Parameter missing or invalid');
         }
         let encryptedKey;
-        if (alg === 'dir') {
-            if (this._cek) {
-                throw new TypeError('setContentEncryptionKey cannot be called when using Direct Encryption');
-            }
-        }
-        else if (alg === 'ECDH-ES') {
-            if (this._cek) {
-                throw new TypeError('setContentEncryptionKey cannot be called when using Direct Key Agreement');
-            }
+        if (this._cek && (alg === 'dir' || alg === 'ECDH-ES')) {
+            throw new TypeError(`setContentEncryptionKey cannot be called with JWE "alg" (Algorithm) Header ${alg}`);
         }
         let cek;
         {
@@ -117,7 +109,6 @@ export class FlattenedEncrypt {
                 }
             }
         }
-        this._iv || (this._iv = generateIv(enc));
         let additionalData;
         let protectedHeader;
         let aadMember;
@@ -134,12 +125,16 @@ export class FlattenedEncrypt {
         else {
             additionalData = protectedHeader;
         }
-        const { ciphertext, tag } = await encrypt(enc, this._plaintext, cek, this._iv, additionalData);
+        const { ciphertext, tag, iv } = await encrypt(enc, this._plaintext, cek, this._iv, additionalData);
         const jwe = {
             ciphertext: base64url(ciphertext),
-            iv: base64url(this._iv),
-            tag: base64url(tag),
         };
+        if (iv) {
+            jwe.iv = base64url(iv);
+        }
+        if (tag) {
+            jwe.tag = base64url(tag);
+        }
         if (encryptedKey) {
             jwe.encrypted_key = base64url(encryptedKey);
         }

package/dist/browser/jwks/remote.js

@@ -9,7 +9,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.2.2';
+    const VERSION = 'v5.2.3';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 class RemoteJWKSet extends LocalJWKSet {

package/dist/browser/lib/aesgcmkw.js

@@ -1,12 +1,14 @@
 import encrypt from '../runtime/encrypt.js';
 import decrypt from '../runtime/decrypt.js';
-import generateIv from './iv.js';
 import { encode as base64url } from '../runtime/base64url.js';
 export async function wrap(alg, key, cek, iv) {
     const jweAlgorithm = alg.slice(0, 7);
-    iv || (iv = generateIv(jweAlgorithm));
-    const { ciphertext: encryptedKey, tag } = await encrypt(jweAlgorithm, cek, key, iv, new Uint8Array(0));
-    return { encryptedKey, iv: base64url(iv), tag: base64url(tag) };
+    const wrapped = await encrypt(jweAlgorithm, cek, key, iv, new Uint8Array(0));
+    return {
+        encryptedKey: wrapped.ciphertext,
+        iv: base64url(wrapped.iv),
+        tag: base64url(wrapped.tag),
+    };
 }
 export async function unwrap(alg, key, encryptedKey, iv, tag) {
     const jweAlgorithm = alg.slice(0, 7);

package/dist/browser/lib/validate_crit.js

@@ -1,6 +1,6 @@
 import { JOSENotSupported } from '../util/errors.js';
 function validateCrit(Err, recognizedDefault, recognizedOption, protectedHeader, joseHeader) {
-    if (joseHeader.crit !== undefined && protectedHeader.crit === undefined) {
+    if (joseHeader.crit !== undefined && protectedHeader?.crit === undefined) {
         throw new Err('"crit" (Critical) Header Parameter MUST be integrity protected');
     }
     if (!protectedHeader || protectedHeader.crit === undefined) {

package/dist/browser/runtime/encrypt.js

@@ -4,6 +4,7 @@ import checkCekLength from './check_cek_length.js';
 import crypto, { isCryptoKey } from './webcrypto.js';
 import { checkEncCryptoKey } from '../lib/crypto_key.js';
 import invalidKeyInput from '../lib/invalid_key_input.js';
+import generateIv from '../lib/iv.js';
 import { JOSENotSupported } from '../util/errors.js';
 import { types } from './is_key_like.js';
 async function cbcEncrypt(enc, plaintext, cek, iv, aad) {
@@ -22,7 +23,7 @@ async function cbcEncrypt(enc, plaintext, cek, iv, aad) {
     }, encKey, plaintext));
     const macData = concat(aad, iv, ciphertext, uint64be(aad.length << 3));
     const tag = new Uint8Array((await crypto.subtle.sign('HMAC', macKey, macData)).slice(0, keySize >> 3));
-    return { ciphertext, tag };
+    return { ciphertext, tag, iv };
 }
 async function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     let encKey;
@@ -41,25 +42,32 @@ async function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     }, encKey, plaintext));
     const tag = encrypted.slice(-16);
     const ciphertext = encrypted.slice(0, -16);
-    return { ciphertext, tag };
+    return { ciphertext, tag, iv };
 }
 const encrypt = async (enc, plaintext, cek, iv, aad) => {
     if (!isCryptoKey(cek) && !(cek instanceof Uint8Array)) {
         throw new TypeError(invalidKeyInput(cek, ...types, 'Uint8Array'));
     }
-    checkIvLength(enc, iv);
+    if (iv) {
+        checkIvLength(enc, iv);
+    }
+    else {
+        iv = generateIv(enc);
+    }
     switch (enc) {
         case 'A128CBC-HS256':
         case 'A192CBC-HS384':
         case 'A256CBC-HS512':
-            if (cek instanceof Uint8Array)
+            if (cek instanceof Uint8Array) {
                 checkCekLength(cek, parseInt(enc.slice(-3), 10));
+            }
             return cbcEncrypt(enc, plaintext, cek, iv, aad);
         case 'A128GCM':
         case 'A192GCM':
         case 'A256GCM':
-            if (cek instanceof Uint8Array)
+            if (cek instanceof Uint8Array) {
                 checkCekLength(cek, parseInt(enc.slice(1, 4), 10));
+            }
             return gcmEncrypt(enc, plaintext, cek, iv, aad);
         default:
             throw new JOSENotSupported('Unsupported JWE Content Encryption Algorithm');

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlattenedEncrypt = exports.unprotected = void 0;
 const base64url_js_1 = require("../../runtime/base64url.js");
 const encrypt_js_1 = require("../../runtime/encrypt.js");
-const iv_js_1 = require("../../lib/iv.js");
 const encrypt_key_management_js_1 = require("../../lib/encrypt_key_management.js");
 const errors_js_1 = require("../../util/errors.js");
 const is_disjoint_js_1 = require("../../lib/is_disjoint.js");
@@ -95,15 +94,8 @@ class FlattenedEncrypt {
             throw new errors_js_1.JWEInvalid('JWE "enc" (Encryption Algorithm) Header Parameter missing or invalid');
         }
         let encryptedKey;
-        if (alg === 'dir') {
-            if (this._cek) {
-                throw new TypeError('setContentEncryptionKey cannot be called when using Direct Encryption');
-            }
-        }
-        else if (alg === 'ECDH-ES') {
-            if (this._cek) {
-                throw new TypeError('setContentEncryptionKey cannot be called when using Direct Key Agreement');
-            }
+        if (this._cek && (alg === 'dir' || alg === 'ECDH-ES')) {
+            throw new TypeError(`setContentEncryptionKey cannot be called with JWE "alg" (Algorithm) Header ${alg}`);
         }
         let cek;
         {
@@ -128,7 +120,6 @@ class FlattenedEncrypt {
                 }
             }
         }
-        this._iv ||= (0, iv_js_1.default)(enc);
         let additionalData;
         let protectedHeader;
         let aadMember;
@@ -145,12 +136,16 @@ class FlattenedEncrypt {
         else {
             additionalData = protectedHeader;
         }
-        const { ciphertext, tag } = await (0, encrypt_js_1.default)(enc, this._plaintext, cek, this._iv, additionalData);
+        const { ciphertext, tag, iv } = await (0, encrypt_js_1.default)(enc, this._plaintext, cek, this._iv, additionalData);
         const jwe = {
             ciphertext: (0, base64url_js_1.encode)(ciphertext),
-            iv: (0, base64url_js_1.encode)(this._iv),
-            tag: (0, base64url_js_1.encode)(tag),
         };
+        if (iv) {
+            jwe.iv = (0, base64url_js_1.encode)(iv);
+        }
+        if (tag) {
+            jwe.tag = (0, base64url_js_1.encode)(tag);
+        }
         if (encryptedKey) {
             jwe.encrypted_key = (0, base64url_js_1.encode)(encryptedKey);
         }

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

@@ -12,7 +12,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.2.2';
+    const VERSION = 'v5.2.3';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 class RemoteJWKSet extends local_js_1.LocalJWKSet {

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

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.unwrap = exports.wrap = void 0;
 const encrypt_js_1 = require("../runtime/encrypt.js");
 const decrypt_js_1 = require("../runtime/decrypt.js");
-const iv_js_1 = require("./iv.js");
 const base64url_js_1 = require("../runtime/base64url.js");
 async function wrap(alg, key, cek, iv) {
     const jweAlgorithm = alg.slice(0, 7);
-    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) };
+    const wrapped = await (0, encrypt_js_1.default)(jweAlgorithm, cek, key, iv, new Uint8Array(0));
+    return {
+        encryptedKey: wrapped.ciphertext,
+        iv: (0, base64url_js_1.encode)(wrapped.iv),
+        tag: (0, base64url_js_1.encode)(wrapped.tag),
+    };
 }
 exports.wrap = wrap;
 async function unwrap(alg, key, encryptedKey, iv, tag) {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const errors_js_1 = require("../util/errors.js");
 function validateCrit(Err, recognizedDefault, recognizedOption, protectedHeader, joseHeader) {
-    if (joseHeader.crit !== undefined && protectedHeader.crit === undefined) {
+    if (joseHeader.crit !== undefined && protectedHeader?.crit === undefined) {
         throw new Err('"crit" (Critical) Header Parameter MUST be integrity protected');
     }
     if (!protectedHeader || protectedHeader.crit === undefined) {

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

@@ -9,6 +9,7 @@ const webcrypto_js_1 = require("./webcrypto.js");
 const crypto_key_js_1 = require("../lib/crypto_key.js");
 const is_key_object_js_1 = require("./is_key_object.js");
 const invalid_key_input_js_1 = require("../lib/invalid_key_input.js");
+const iv_js_1 = require("../lib/iv.js");
 const errors_js_1 = require("../util/errors.js");
 const ciphers_js_1 = require("./ciphers.js");
 const is_key_like_js_1 = require("./is_key_like.js");
@@ -27,7 +28,7 @@ function cbcEncrypt(enc, plaintext, cek, iv, aad) {
     const ciphertext = (0, buffer_utils_js_1.concat)(cipher.update(plaintext), cipher.final());
     const macSize = parseInt(enc.slice(-3), 10);
     const tag = (0, cbc_tag_js_1.default)(aad, iv, ciphertext, macSize, macKey, keySize);
-    return { ciphertext, tag };
+    return { ciphertext, tag, iv };
 }
 function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     const keySize = parseInt(enc.slice(1, 4), 10);
@@ -42,7 +43,7 @@ function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     const ciphertext = cipher.update(plaintext);
     cipher.final();
     const tag = cipher.getAuthTag();
-    return { ciphertext, tag };
+    return { ciphertext, tag, iv };
 }
 const encrypt = (enc, plaintext, cek, iv, aad) => {
     let key;
@@ -57,7 +58,12 @@ const encrypt = (enc, plaintext, cek, iv, aad) => {
         throw new TypeError((0, invalid_key_input_js_1.default)(cek, ...is_key_like_js_1.types, 'Uint8Array'));
     }
     (0, check_cek_length_js_1.default)(enc, key);
-    (0, check_iv_length_js_1.default)(enc, iv);
+    if (iv) {
+        (0, check_iv_length_js_1.default)(enc, iv);
+    }
+    else {
+        iv = (0, iv_js_1.default)(enc);
+    }
     switch (enc) {
         case 'A128CBC-HS256':
         case 'A192CBC-HS384':

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

@@ -1,6 +1,5 @@
 import { encode as base64url } from '../../runtime/base64url.js';
 import encrypt from '../../runtime/encrypt.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';
@@ -92,15 +91,8 @@ export class FlattenedEncrypt {
             throw new JWEInvalid('JWE "enc" (Encryption Algorithm) Header Parameter missing or invalid');
         }
         let encryptedKey;
-        if (alg === 'dir') {
-            if (this._cek) {
-                throw new TypeError('setContentEncryptionKey cannot be called when using Direct Encryption');
-            }
-        }
-        else if (alg === 'ECDH-ES') {
-            if (this._cek) {
-                throw new TypeError('setContentEncryptionKey cannot be called when using Direct Key Agreement');
-            }
+        if (this._cek && (alg === 'dir' || alg === 'ECDH-ES')) {
+            throw new TypeError(`setContentEncryptionKey cannot be called with JWE "alg" (Algorithm) Header ${alg}`);
         }
         let cek;
         {
@@ -125,7 +117,6 @@ export class FlattenedEncrypt {
                 }
             }
         }
-        this._iv ||= generateIv(enc);
         let additionalData;
         let protectedHeader;
         let aadMember;
@@ -142,12 +133,16 @@ export class FlattenedEncrypt {
         else {
             additionalData = protectedHeader;
         }
-        const { ciphertext, tag } = await encrypt(enc, this._plaintext, cek, this._iv, additionalData);
+        const { ciphertext, tag, iv } = await encrypt(enc, this._plaintext, cek, this._iv, additionalData);
         const jwe = {
             ciphertext: base64url(ciphertext),
-            iv: base64url(this._iv),
-            tag: base64url(tag),
         };
+        if (iv) {
+            jwe.iv = base64url(iv);
+        }
+        if (tag) {
+            jwe.tag = base64url(tag);
+        }
         if (encryptedKey) {
             jwe.encrypted_key = base64url(encryptedKey);
         }

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

@@ -9,7 +9,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.2.2';
+    const VERSION = 'v5.2.3';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 class RemoteJWKSet extends LocalJWKSet {

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

@@ -1,12 +1,14 @@
 import encrypt from '../runtime/encrypt.js';
 import decrypt from '../runtime/decrypt.js';
-import generateIv from './iv.js';
 import { encode as base64url } from '../runtime/base64url.js';
 export async function wrap(alg, key, cek, iv) {
     const jweAlgorithm = alg.slice(0, 7);
-    iv ||= generateIv(jweAlgorithm);
-    const { ciphertext: encryptedKey, tag } = await encrypt(jweAlgorithm, cek, key, iv, new Uint8Array(0));
-    return { encryptedKey, iv: base64url(iv), tag: base64url(tag) };
+    const wrapped = await encrypt(jweAlgorithm, cek, key, iv, new Uint8Array(0));
+    return {
+        encryptedKey: wrapped.ciphertext,
+        iv: base64url(wrapped.iv),
+        tag: base64url(wrapped.tag),
+    };
 }
 export async function unwrap(alg, key, encryptedKey, iv, tag) {
     const jweAlgorithm = alg.slice(0, 7);

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

@@ -1,6 +1,6 @@
 import { JOSENotSupported } from '../util/errors.js';
 function validateCrit(Err, recognizedDefault, recognizedOption, protectedHeader, joseHeader) {
-    if (joseHeader.crit !== undefined && protectedHeader.crit === undefined) {
+    if (joseHeader.crit !== undefined && protectedHeader?.crit === undefined) {
         throw new Err('"crit" (Critical) Header Parameter MUST be integrity protected');
     }
     if (!protectedHeader || protectedHeader.crit === undefined) {

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

@@ -7,6 +7,7 @@ import { isCryptoKey } from './webcrypto.js';
 import { checkEncCryptoKey } from '../lib/crypto_key.js';
 import isKeyObject from './is_key_object.js';
 import invalidKeyInput from '../lib/invalid_key_input.js';
+import generateIv from '../lib/iv.js';
 import { JOSENotSupported } from '../util/errors.js';
 import supported from './ciphers.js';
 import { types } from './is_key_like.js';
@@ -25,7 +26,7 @@ function cbcEncrypt(enc, plaintext, cek, iv, aad) {
     const ciphertext = concat(cipher.update(plaintext), cipher.final());
     const macSize = parseInt(enc.slice(-3), 10);
     const tag = cbcTag(aad, iv, ciphertext, macSize, macKey, keySize);
-    return { ciphertext, tag };
+    return { ciphertext, tag, iv };
 }
 function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     const keySize = parseInt(enc.slice(1, 4), 10);
@@ -40,7 +41,7 @@ function gcmEncrypt(enc, plaintext, cek, iv, aad) {
     const ciphertext = cipher.update(plaintext);
     cipher.final();
     const tag = cipher.getAuthTag();
-    return { ciphertext, tag };
+    return { ciphertext, tag, iv };
 }
 const encrypt = (enc, plaintext, cek, iv, aad) => {
     let key;
@@ -55,7 +56,12 @@ const encrypt = (enc, plaintext, cek, iv, aad) => {
         throw new TypeError(invalidKeyInput(cek, ...types, 'Uint8Array'));
     }
     checkCekLength(enc, key);
-    checkIvLength(enc, iv);
+    if (iv) {
+        checkIvLength(enc, iv);
+    }
+    else {
+        iv = generateIv(enc);
+    }
     switch (enc) {
         case 'A128CBC-HS256':
         case 'A192CBC-HS384':

package/package.json

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