@sebastienrousseau/crypto-lib 0.0.9 → 0.0.25

package/dist/accel/wasm-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wasm-bridge.d.ts","sourceRoot":"","sources":["../../src/accel/wasm-bridge.ts"],"names":[],"mappings":"AA8BA,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC;AAGtD,MAAM,MAAM,iBAAiB,GAC3B,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAC;AAG3D,MAAM,WAAW,eAAe;IAE9B,SAAS,EAAE,iBAAiB,CAAC;IAE7B,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAE1B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC3B;AAGD,MAAM,WAAW,cAAc;IAE7B,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,iBAAiB,CAAC;IAE7B,OAAO,EAAE,WAAW,CAAC;CACtB;AAGD,MAAM,WAAW,sBAAsB;IAErC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;IAEzB,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC;IAE/B,GAAG,CAAC,EAAE,UAAU,CAAC;CAClB;AAGD,MAAM,WAAW,qBAAqB;IAEpC,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,WAAW,CAAC;CACtB;AAGD,MAAM,WAAW,qBAAqB;IAEpC,SAAS,EAAE,UAAU,CAAC;IAEtB,OAAO,EAAE,WAAW,CAAC;CACtB;AAoBD,wBAAgB,iBAAiB,IAAI,WAAW,CA0E/C;AASD,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAkDD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,cAAc,CAYjE;AAgBD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,sBAAsB,GAC9B,qBAAqB,CAsBvB;AAWD,wBAAgB,eAAe,CAAC,OAAO,EAAE;IAEvC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;IAEzB,UAAU,EAAE,MAAM,CAAC;IAEnB,GAAG,CAAC,EAAE,UAAU,CAAC;CAClB,GAAG,qBAAqB,CAmBxB"}
+{"version":3,"file":"wasm-bridge.d.ts","sourceRoot":"","sources":["../../src/accel/wasm-bridge.ts"],"names":[],"mappings":"AA8BA,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC;AAGtD,MAAM,MAAM,iBAAiB,GAC3B,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAC;AAG3D,MAAM,WAAW,eAAe;IAE9B,SAAS,EAAE,iBAAiB,CAAC;IAE7B,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAE1B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC3B;AAGD,MAAM,WAAW,cAAc;IAE7B,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,iBAAiB,CAAC;IAE7B,OAAO,EAAE,WAAW,CAAC;CACtB;AAGD,MAAM,WAAW,sBAAsB;IAErC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;IAEzB,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC;IAE/B,GAAG,CAAC,EAAE,UAAU,CAAC;CAClB;AAGD,MAAM,WAAW,qBAAqB;IAEpC,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,WAAW,CAAC;CACtB;AAGD,MAAM,WAAW,qBAAqB;IAEpC,SAAS,EAAE,UAAU,CAAC;IAEtB,OAAO,EAAE,WAAW,CAAC;CACtB;AAmED,wBAAgB,iBAAiB,IAAI,WAAW,CA4B/C;AASD,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAkDD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,cAAc,CAYjE;AAgBD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,sBAAsB,GAC9B,qBAAqB,CAsBvB;AAWD,wBAAgB,eAAe,CAAC,OAAO,EAAE;IAEvC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;IAEzB,UAAU,EAAE,MAAM,CAAC;IAEnB,GAAG,CAAC,EAAE,UAAU,CAAC;CAClB,GAAG,qBAAqB,CAmBxB"}

package/dist/accel/wasm-bridge.js

@@ -11,6 +11,51 @@ const blake3_js_1 = require("@noble/hashes/blake3.js");
 const chacha_js_1 = require("@noble/ciphers/chacha.js");
 const utils_js_1 = require("@noble/ciphers/utils.js");
 let cachedBackend;
+const SIMD_TEST_BYTES = new Uint8Array([
+    0x00,
+    0x61,
+    0x73,
+    0x6d,
+    0x01,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
+    0x05,
+    0x01,
+    0x60,
+    0x00,
+    0x01,
+    0x7b,
+    0x03,
+    0x02,
+    0x01,
+    0x00,
+    0x0a,
+    0x0a,
+    0x01,
+    0x08,
+    0x00,
+    0xfd,
+    0x0c,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x0b,
+]);
 function detectWasmBackend() {
     if (cachedBackend !== undefined)
         return cachedBackend;
@@ -21,52 +66,7 @@ function detectWasmBackend() {
         return cachedBackend;
     }
     try {
-        const simdTest = new Uint8Array([
-            0x00,
-            0x61,
-            0x73,
-            0x6d,
-            0x01,
-            0x00,
-            0x00,
-            0x00,
-            0x01,
-            0x05,
-            0x01,
-            0x60,
-            0x00,
-            0x01,
-            0x7b,
-            0x03,
-            0x02,
-            0x01,
-            0x00,
-            0x0a,
-            0x0a,
-            0x01,
-            0x08,
-            0x00,
-            0xfd,
-            0x0c,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x0b,
-        ]);
-        const mod = new WA.Module(simdTest);
+        const mod = new WA.Module(SIMD_TEST_BYTES);
         if (mod) {
             cachedBackend = "wasm-simd";
             return cachedBackend;

package/dist/high-level/index.d.ts

@@ -6,6 +6,6 @@ export { passwordEncrypt, passwordDecrypt } from "./password-encrypt";
 export type { PasswordEncryptOptions, PasswordEncryptResult, } from "./password-encrypt";
 export { aesKwWrap, aesKwUnwrap, aesKwpWrap, aesKwpUnwrap, x25519AesKwWrap, x25519AesKwUnwrap, } from "./key-wrap";
 export type { AesKwWrapResult, X25519AesKwWrapResult } from "./key-wrap";
-export { multiEncrypt, multiDecryptClassical, multiDecryptPQ, } from "./multi-recipient";
+export { multiEncrypt, multiDecryptClassical, multiDecryptPQ, wrapDekHybrid, unwrapDekHybrid, } from "./multi-recipient";
 export type { ClassicalRecipient, PqRecipient, Recipient, WrappedKey, MultiRecipientEncryptResult, } from "./multi-recipient";
 //# sourceMappingURL=index.d.ts.map

package/dist/high-level/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/high-level/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAEzC,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAEzC,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEtE,YAAY,EACV,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,eAAe,EACf,iBAAiB,GAClB,MAAM,YAAY,CAAC;AAEpB,YAAY,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEzE,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,cAAc,GACf,MAAM,mBAAmB,CAAC;AAE3B,YAAY,EACV,kBAAkB,EAClB,WAAW,EACX,SAAS,EACT,UAAU,EACV,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/high-level/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAEzC,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAEzC,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEtE,YAAY,EACV,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,eAAe,EACf,iBAAiB,GAClB,MAAM,YAAY,CAAC;AAEpB,YAAY,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEzE,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,cAAc,EACd,aAAa,EACb,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAE3B,YAAY,EACV,kBAAkB,EAClB,WAAW,EACX,SAAS,EACT,UAAU,EACV,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC"}

package/dist/high-level/index.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.multiDecryptPQ = exports.multiDecryptClassical = exports.multiEncrypt = exports.x25519AesKwUnwrap = exports.x25519AesKwWrap = exports.aesKwpUnwrap = exports.aesKwpWrap = exports.aesKwUnwrap = exports.aesKwWrap = exports.passwordDecrypt = exports.passwordEncrypt = exports.sealedbox = exports.secretbox = void 0;
+exports.unwrapDekHybrid = exports.wrapDekHybrid = exports.multiDecryptPQ = exports.multiDecryptClassical = exports.multiEncrypt = exports.x25519AesKwUnwrap = exports.x25519AesKwWrap = exports.aesKwpUnwrap = exports.aesKwpWrap = exports.aesKwUnwrap = exports.aesKwWrap = exports.passwordDecrypt = exports.passwordEncrypt = exports.sealedbox = exports.secretbox = void 0;
 exports.secretbox = __importStar(require("./secretbox"));
 exports.sealedbox = __importStar(require("./sealedbox"));
 var password_encrypt_1 = require("./password-encrypt");
@@ -50,4 +50,6 @@ var multi_recipient_1 = require("./multi-recipient");
 Object.defineProperty(exports, "multiEncrypt", { enumerable: true, get: function () { return multi_recipient_1.multiEncrypt; } });
 Object.defineProperty(exports, "multiDecryptClassical", { enumerable: true, get: function () { return multi_recipient_1.multiDecryptClassical; } });
 Object.defineProperty(exports, "multiDecryptPQ", { enumerable: true, get: function () { return multi_recipient_1.multiDecryptPQ; } });
+Object.defineProperty(exports, "wrapDekHybrid", { enumerable: true, get: function () { return multi_recipient_1.wrapDekHybrid; } });
+Object.defineProperty(exports, "unwrapDekHybrid", { enumerable: true, get: function () { return multi_recipient_1.unwrapDekHybrid; } });
 //# sourceMappingURL=index.js.map

package/dist/high-level/multi-recipient.d.ts

@@ -21,5 +21,11 @@ export interface MultiRecipientEncryptResult {
 }
 export declare function multiEncrypt(recipients: Recipient[], plaintext: string | Uint8Array): MultiRecipientEncryptResult;
 export declare function multiDecryptClassical(secretKey: string | Uint8Array, wrappedKey: WrappedKey, ciphertext: string): Uint8Array;
+export declare function wrapDekHybrid(dek: Uint8Array, x25519PublicKey: string, mlKemPublicKey: string): {
+    wrappedKey: string;
+    ephemeralPublicKey: string;
+    mlKemCiphertext: string;
+};
+export declare function unwrapDekHybrid(x25519SecretKey: string | Uint8Array, mlKemSecretKey: string | Uint8Array, ephemeralPublicKey: string, mlKemCiphertext: string, wrappedKey: string): Uint8Array;
 export declare function multiDecryptPQ(x25519SecretKey: string | Uint8Array, mlKemSecretKey: string | Uint8Array, wrappedKey: WrappedKey, ciphertext: string): Uint8Array;
 //# sourceMappingURL=multi-recipient.d.ts.map

package/dist/high-level/multi-recipient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multi-recipient.d.ts","sourceRoot":"","sources":["../../src/high-level/multi-recipient.ts"],"names":[],"mappings":"AAwCA,MAAM,WAAW,kBAAkB;IAEjC,IAAI,EAAE,QAAQ,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,WAAW;IAE1B,IAAI,EAAE,mBAAmB,CAAC;IAE1B,eAAe,EAAE,MAAM,CAAC;IAExB,cAAc,EAAE,MAAM,CAAC;CACxB;AAGD,MAAM,MAAM,SAAS,GAAG,kBAAkB,GAAG,WAAW,CAAC;AAGzD,MAAM,WAAW,UAAU;IAEzB,IAAI,EAAE,QAAQ,GAAG,mBAAmB,CAAC;IAErC,UAAU,EAAE,MAAM,CAAC;IAEnB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAGD,MAAM,WAAW,2BAA2B;IAE1C,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,UAAU,EAAE,CAAC;IAEzB,SAAS,EAAE,2BAA2B,CAAC;CACxC;AAQD,wBAAgB,YAAY,CAC1B,UAAU,EAAE,SAAS,EAAE,EACvB,SAAS,EAAE,MAAM,GAAG,UAAU,GAC7B,2BAA2B,CAgE7B;AASD,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,GAAG,UAAU,EAC9B,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,GACjB,UAAU,CAOZ;AAUD,wBAAgB,cAAc,CAC5B,eAAe,EAAE,MAAM,GAAG,UAAU,EACpC,cAAc,EAAE,MAAM,GAAG,UAAU,EACnC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,GACjB,UAAU,CAuCZ"}
+{"version":3,"file":"multi-recipient.d.ts","sourceRoot":"","sources":["../../src/high-level/multi-recipient.ts"],"names":[],"mappings":"AAwCA,MAAM,WAAW,kBAAkB;IAEjC,IAAI,EAAE,QAAQ,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,WAAW;IAE1B,IAAI,EAAE,mBAAmB,CAAC;IAE1B,eAAe,EAAE,MAAM,CAAC;IAExB,cAAc,EAAE,MAAM,CAAC;CACxB;AAGD,MAAM,MAAM,SAAS,GAAG,kBAAkB,GAAG,WAAW,CAAC;AAGzD,MAAM,WAAW,UAAU;IAEzB,IAAI,EAAE,QAAQ,GAAG,mBAAmB,CAAC;IAErC,UAAU,EAAE,MAAM,CAAC;IAEnB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAGD,MAAM,WAAW,2BAA2B;IAE1C,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,UAAU,EAAE,CAAC;IAEzB,SAAS,EAAE,2BAA2B,CAAC;CACxC;AAQD,wBAAgB,YAAY,CAC1B,UAAU,EAAE,SAAS,EAAE,EACvB,SAAS,EAAE,MAAM,GAAG,UAAU,GAC7B,2BAA2B,CAkC7B;AASD,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,GAAG,UAAU,EAC9B,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,GACjB,UAAU,CAOZ;AASD,wBAAgB,aAAa,CAC3B,GAAG,EAAE,UAAU,EACf,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;CACzB,CAkCA;AAWD,wBAAgB,eAAe,CAC7B,eAAe,EAAE,MAAM,GAAG,UAAU,EACpC,cAAc,EAAE,MAAM,GAAG,UAAU,EACnC,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,UAAU,CAiCZ;AAUD,wBAAgB,cAAc,CAC5B,eAAe,EAAE,MAAM,GAAG,UAAU,EACpC,cAAc,EAAE,MAAM,GAAG,UAAU,EACnC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,GACjB,UAAU,CAcZ"}

package/dist/high-level/multi-recipient.js

@@ -35,6 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.multiEncrypt = multiEncrypt;
 exports.multiDecryptClassical = multiDecryptClassical;
+exports.wrapDekHybrid = wrapDekHybrid;
+exports.unwrapDekHybrid = unwrapDekHybrid;
 exports.multiDecryptPQ = multiDecryptPQ;
 const utils_js_1 = require("@noble/ciphers/utils.js");
 const secretbox = __importStar(require("./secretbox"));
@@ -66,23 +68,10 @@ function multiEncrypt(recipients, plaintext) {
             };
         }
         else {
-            const x25519Pub = hexToBytes(r.x25519PublicKey);
-            const mlKemPub = hexToBytes(r.mlKemPublicKey);
-            const ephPriv = (0, utils_js_1.randomBytes)(32);
-            const ephPub = ed25519_js_1.x25519.getPublicKey(ephPriv);
-            const x25519Shared = ed25519_js_1.x25519.getSharedSecret(ephPriv, x25519Pub);
-            const { cipherText: mlKemCt, sharedSecret: mlKemShared } = ml_kem_js_1.ml_kem768.encapsulate(mlKemPub);
-            const combined = new Uint8Array(x25519Shared.length + mlKemShared.length);
-            combined.set(x25519Shared);
-            combined.set(mlKemShared, x25519Shared.length);
-            const kek = (0, hkdf_js_1.hkdf)(sha2_js_1.sha256, combined, ephPub, new TextEncoder().encode("multi-recipient-pq-v1"), 32);
-            const cipher = (0, aes_js_1.aeskw)(kek);
-            const wrapped = cipher.encrypt(dek);
+            const wrapped = wrapDekHybrid(dek, r.x25519PublicKey, r.mlKemPublicKey);
             return {
                 type: "x25519-ml-kem-768",
-                wrappedKey: Buffer.from(wrapped).toString("base64"),
-                ephemeralPublicKey: Buffer.from(ephPub).toString("hex"),
-                mlKemCiphertext: Buffer.from(mlKemCt).toString("hex"),
+                ...wrapped,
             };
         }
     });
@@ -96,27 +85,49 @@ function multiDecryptClassical(secretKey, wrappedKey, ciphertext) {
     const dek = (0, key_wrap_1.x25519AesKwUnwrap)(secretKey, wrappedKey.ephemeralPublicKey, wrappedKey.wrappedKey);
     return secretbox.open(dek, ciphertext);
 }
-function multiDecryptPQ(x25519SecretKey, mlKemSecretKey, wrappedKey, ciphertext) {
+function wrapDekHybrid(dek, x25519PublicKey, mlKemPublicKey) {
+    const x25519Pub = hexToBytes(x25519PublicKey);
+    const mlKemPub = hexToBytes(mlKemPublicKey);
+    const ephPriv = (0, utils_js_1.randomBytes)(32);
+    const ephPub = ed25519_js_1.x25519.getPublicKey(ephPriv);
+    const x25519Shared = ed25519_js_1.x25519.getSharedSecret(ephPriv, x25519Pub);
+    const { cipherText: mlKemCt, sharedSecret: mlKemShared } = ml_kem_js_1.ml_kem768.encapsulate(mlKemPub);
+    const combined = new Uint8Array(x25519Shared.length + mlKemShared.length);
+    combined.set(x25519Shared);
+    combined.set(mlKemShared, x25519Shared.length);
+    const kek = (0, hkdf_js_1.hkdf)(sha2_js_1.sha256, combined, ephPub, new TextEncoder().encode("multi-recipient-pq-v1"), 32);
+    const cipher = (0, aes_js_1.aeskw)(kek);
+    const wrapped = cipher.encrypt(dek);
+    return {
+        wrappedKey: Buffer.from(wrapped).toString("base64"),
+        ephemeralPublicKey: Buffer.from(ephPub).toString("hex"),
+        mlKemCiphertext: Buffer.from(mlKemCt).toString("hex"),
+    };
+}
+function unwrapDekHybrid(x25519SecretKey, mlKemSecretKey, ephemeralPublicKey, mlKemCiphertext, wrappedKey) {
     const x25519Sec = typeof x25519SecretKey === "string"
         ? hexToBytes(x25519SecretKey)
         : x25519SecretKey;
     const mlKemSec = typeof mlKemSecretKey === "string"
         ? hexToBytes(mlKemSecretKey)
         : mlKemSecretKey;
-    if (!wrappedKey.mlKemCiphertext) {
-        throw new Error("Missing ML-KEM ciphertext in wrapped key");
-    }
-    const ephPub = hexToBytes(wrappedKey.ephemeralPublicKey);
-    const mlKemCt = hexToBytes(wrappedKey.mlKemCiphertext);
+    const ephPub = hexToBytes(ephemeralPublicKey);
+    const mlKemCt = hexToBytes(mlKemCiphertext);
     const x25519Shared = ed25519_js_1.x25519.getSharedSecret(x25519Sec, ephPub);
     const mlKemShared = ml_kem_js_1.ml_kem768.decapsulate(mlKemCt, mlKemSec);
     const combined = new Uint8Array(x25519Shared.length + mlKemShared.length);
     combined.set(x25519Shared);
     combined.set(mlKemShared, x25519Shared.length);
     const kek = (0, hkdf_js_1.hkdf)(sha2_js_1.sha256, combined, ephPub, new TextEncoder().encode("multi-recipient-pq-v1"), 32);
-    const wrapped = Buffer.from(wrappedKey.wrappedKey, "base64");
+    const wrapped = Buffer.from(wrappedKey, "base64");
     const cipher = (0, aes_js_1.aeskw)(kek);
-    const dek = cipher.decrypt(wrapped);
+    return cipher.decrypt(wrapped);
+}
+function multiDecryptPQ(x25519SecretKey, mlKemSecretKey, wrappedKey, ciphertext) {
+    if (!wrappedKey.mlKemCiphertext) {
+        throw new Error("Missing ML-KEM ciphertext in wrapped key");
+    }
+    const dek = unwrapDekHybrid(x25519SecretKey, mlKemSecretKey, wrappedKey.ephemeralPublicKey, wrappedKey.mlKemCiphertext, wrappedKey.wrappedKey);
     return secretbox.open(dek, ciphertext);
 }
 //# sourceMappingURL=multi-recipient.js.map

package/dist/modern/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/modern/hash.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,eAAe,sFAQlB,CAAC;AAGX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAG7D,MAAM,WAAW,WAAW;IAE1B,SAAS,EAAE,aAAa,CAAC;IAEzB,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;CAC3B;AAGD,MAAM,WAAW,UAAU;IAEzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,aAAa,CAAC;IAEzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAuBD,wBAAgB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU,CAiBrD"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/modern/hash.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,eAAe,sFAQlB,CAAC;AAGX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAG7D,MAAM,WAAW,WAAW;IAE1B,SAAS,EAAE,aAAa,CAAC;IAEzB,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;CAC3B;AAGD,MAAM,WAAW,UAAU;IAEzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,aAAa,CAAC;IAEzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAWD,wBAAgB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU,CAqCrD"}

package/dist/modern/hash.js

@@ -20,22 +20,34 @@ function toBytes(input) {
         return input;
     return Buffer.from(input, "utf8");
 }
-const hashFunctions = {
-    sha256: (d) => (0, sha2_js_1.sha256)(d),
-    sha384: (d) => (0, sha2_js_1.sha384)(d),
-    sha512: (d) => (0, sha2_js_1.sha512)(d),
-    "sha3-256": (d) => (0, sha3_js_1.sha3_256)(d),
-    "sha3-512": (d) => (0, sha3_js_1.sha3_512)(d),
-    blake2b: (d) => (0, blake2_js_1.blake2b)(d),
-    blake3: (d) => (0, blake3_js_1.blake3)(d),
-};
 function hash(options) {
-    const fn = hashFunctions[options.algorithm];
-    if (!fn) {
-        throw new Error(`Unsupported algorithm: ${options.algorithm}. Supported: ${exports.HASH_ALGORITHMS.join(", ")}`);
-    }
     const data = toBytes(options.data);
-    const digest = fn(data);
+    let digest;
+    switch (options.algorithm) {
+        case "sha256":
+            digest = (0, sha2_js_1.sha256)(data);
+            break;
+        case "sha384":
+            digest = (0, sha2_js_1.sha384)(data);
+            break;
+        case "sha512":
+            digest = (0, sha2_js_1.sha512)(data);
+            break;
+        case "sha3-256":
+            digest = (0, sha3_js_1.sha3_256)(data);
+            break;
+        case "sha3-512":
+            digest = (0, sha3_js_1.sha3_512)(data);
+            break;
+        case "blake2b":
+            digest = (0, blake2_js_1.blake2b)(data);
+            break;
+        case "blake3":
+            digest = (0, blake3_js_1.blake3)(data);
+            break;
+        default:
+            throw new Error(`Unsupported algorithm: ${options.algorithm}. Supported: ${exports.HASH_ALGORITHMS.join(", ")}`);
+    }
     return {
         digest: Buffer.from(digest).toString("hex"),
         algorithm: options.algorithm,

package/dist/modern/hpke.d.ts

@@ -1,4 +1,4 @@
-export type HpkeKem = "x25519" | "p256";
+export type HpkeKem = "x25519" | "p256" | "x25519-ml-kem-768";
 export type HpkeAead = "chacha20-poly1305" | "aes-128-gcm";
 export type HpkeMode = "base" | "psk";
 export interface HpkeKeyPair {

package/dist/modern/hpke.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hpke.d.ts","sourceRoot":"","sources":["../../src/modern/hpke.ts"],"names":[],"mappings":"AA4DA,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAUxC,MAAM,MAAM,QAAQ,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAU3D,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC;AAUtC,MAAM,WAAW,WAAW;IAE1B,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU,EAAE,MAAM,CAAC;CACpB;AAUD,MAAM,WAAW,cAAc;IAE7B,UAAU,EAAE,MAAM,CAAC;IAEnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAUD,MAAM,WAAW,cAAc;IAE7B,SAAS,EAAE,MAAM,CAAC;CACnB;AAUD,MAAM,WAAW,gBAAgB;IAE/B,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAUD,MAAM,WAAW,cAAc;IAE7B,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;CACf;AAiWD,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,OAAkB,GAAG,WAAW,CAMxE;AAuBD,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAEhC,kBAAkB,EAAE,MAAM,CAAC;IAE3B,SAAS,EAAE,MAAM,CAAC;IAElB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB,GAAG,CAAC,EAAE,cAAc,CAAC;CACtB,GAAG,cAAc,CAOjB;AAUD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,EACvC,mBAAmB,EAAE,UAAU,GAC9B,cAAc,GAAG;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB,CA2BA;AA0BD,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAEhC,mBAAmB,EAAE,MAAM,CAAC;IAE5B,eAAe,EAAE,MAAM,CAAC;IAExB,UAAU,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB,GAAG,CAAC,EAAE,cAAc,CAAC;CACtB,GAAG,cAAc,CAgBjB"}
+{"version":3,"file":"hpke.d.ts","sourceRoot":"","sources":["../../src/modern/hpke.ts"],"names":[],"mappings":"AA+DA,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,mBAAmB,CAAC;AAU9D,MAAM,MAAM,QAAQ,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAU3D,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC;AAUtC,MAAM,WAAW,WAAW;IAE1B,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU,EAAE,MAAM,CAAC;CACpB;AAUD,MAAM,WAAW,cAAc;IAE7B,UAAU,EAAE,MAAM,CAAC;IAEnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAUD,MAAM,WAAW,cAAc;IAE7B,SAAS,EAAE,MAAM,CAAC;CACnB;AAUD,MAAM,WAAW,gBAAgB;IAE/B,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAUD,MAAM,WAAW,cAAc;IAE7B,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;CACf;AAoaD,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,OAAkB,GAAG,WAAW,CAexE;AAuBD,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAEhC,kBAAkB,EAAE,MAAM,CAAC;IAE3B,SAAS,EAAE,MAAM,CAAC;IAElB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB,GAAG,CAAC,EAAE,cAAc,CAAC;CACtB,GAAG,cAAc,CAWjB;AAUD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,EACvC,mBAAmB,EAAE,UAAU,GAC9B,cAAc,GAAG;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB,CAyBA;AA0BD,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAEhC,mBAAmB,EAAE,MAAM,CAAC;IAE5B,eAAe,EAAE,MAAM,CAAC;IAExB,UAAU,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB,GAAG,CAAC,EAAE,cAAc,CAAC;CACtB,GAAG,cAAc,CAmBjB"}

package/dist/modern/hpke.js

@@ -10,8 +10,10 @@ const hkdf_js_1 = require("@noble/hashes/hkdf.js");
 const sha2_js_1 = require("@noble/hashes/sha2.js");
 const chacha_js_1 = require("@noble/ciphers/chacha.js");
 const aes_js_1 = require("@noble/ciphers/aes.js");
+const ml_kem_js_1 = require("@noble/post-quantum/ml-kem.js");
 const KEM_X25519 = 0x0020;
 const KEM_P256 = 0x0010;
+const KEM_X25519_MLKEM768 = 0x0030;
 const KDF_HKDF_SHA256 = 0x0001;
 const AEAD_AES_128_GCM = 0x0001;
 const AEAD_CHACHA20_POLY1305 = 0x0003;
@@ -31,31 +33,42 @@ function i2osp2(n) {
     return new Uint8Array([(n >> 8) & 0xff, n & 0xff]);
 }
 function concat(...arrays) {
-    const len = arrays.reduce((s, a) => s + a.length, 0);
+    let len = 0;
+    for (let i = 0; i < arrays.length; i++) {
+        len += arrays[i].length;
+    }
     const result = new Uint8Array(len);
     let offset = 0;
-    for (const a of arrays) {
+    for (let i = 0; i < arrays.length; i++) {
+        const a = arrays[i];
         result.set(a, offset);
         offset += a.length;
     }
     return result;
 }
 function suiteParams(kem, aead) {
-    const kemId = kem === "x25519" ? KEM_X25519 : KEM_P256;
-    const aeadId = aead === "chacha20-poly1305" ? AEAD_CHACHA20_POLY1305 : AEAD_AES_128_GCM;
-    const nk = aead === "chacha20-poly1305" ? 32 : 16;
-    const nn = 12;
-    const nSecret = 32;
+    let kemId;
     let nEnc;
     let nSk;
     if (kem === "x25519") {
+        kemId = KEM_X25519;
         nEnc = 32;
         nSk = 32;
     }
-    else {
+    else if (kem === "p256") {
+        kemId = KEM_P256;
         nEnc = 65;
         nSk = 32;
     }
+    else {
+        kemId = KEM_X25519_MLKEM768;
+        nEnc = 1120;
+        nSk = 2432;
+    }
+    const aeadId = aead === "chacha20-poly1305" ? AEAD_CHACHA20_POLY1305 : AEAD_AES_128_GCM;
+    const nk = aead === "chacha20-poly1305" ? 32 : 16;
+    const nn = 12;
+    const nSecret = 32;
     return {
         kemId,
         kdfId: KDF_HKDF_SHA256,
@@ -113,6 +126,40 @@ function dhkemDecap(kem, enc, recipientPriv, params) {
     const recipientPub = kemPublicKey(kem, recipientPriv);
     return extractAndExpand(params, dh, concat(enc, recipientPub));
 }
+function hybridEncap(recipientPub, ephemeralPrivateKey, params) {
+    if (recipientPub.length !== 1216) {
+        throw new Error("Invalid recipient public key length for x25519-ml-kem-768");
+    }
+    const pkX = recipientPub.subarray(0, 32);
+    const pkMlKem = recipientPub.subarray(32);
+    const ephPrivX = ephemeralPrivateKey.subarray(0, 32);
+    const encX = ed25519_js_1.x25519.getPublicKey(ephPrivX);
+    const ssClassical = ed25519_js_1.x25519.getSharedSecret(ephPrivX, pkX);
+    const { cipherText: ctMlKem, sharedSecret: ssMlKem } = ml_kem_js_1.ml_kem768.encapsulate(pkMlKem);
+    const enc = concat(encX, ctMlKem);
+    const ikm = concat(ssClassical, ssMlKem);
+    const sharedSecret = extractAndExpand(params, ikm, concat(enc, recipientPub));
+    return { sharedSecret, enc };
+}
+function hybridDecap(enc, recipientPriv, params) {
+    if (recipientPriv.length !== 2432) {
+        throw new Error("Invalid recipient private key length for x25519-ml-kem-768");
+    }
+    if (enc.length !== 1120) {
+        throw new Error("Invalid encapsulated key length for x25519-ml-kem-768");
+    }
+    const skX = recipientPriv.subarray(0, 32);
+    const skMlKem = recipientPriv.subarray(32);
+    const encX = enc.subarray(0, 32);
+    const ctMlKem = enc.subarray(32);
+    const ssClassical = ed25519_js_1.x25519.getSharedSecret(skX, encX);
+    const ssMlKem = ml_kem_js_1.ml_kem768.decapsulate(ctMlKem, skMlKem);
+    const pkX = ed25519_js_1.x25519.getPublicKey(skX);
+    const pkMlKem = ml_kem_js_1.ml_kem768.getPublicKey(skMlKem);
+    const recipientPub = concat(pkX, pkMlKem);
+    const ikm = concat(ssClassical, ssMlKem);
+    return extractAndExpand(params, ikm, concat(enc, recipientPub));
+}
 function keySchedule(params, sharedSecret, inputs) {
     const suiteId = hpkeSuiteId(params);
     const empty = new Uint8Array(0);
@@ -156,6 +203,15 @@ function aeadOpen(aead, key, nonce, aad, ciphertext) {
     return (0, aes_js_1.gcm)(key, nonce, aad).decrypt(ciphertext);
 }
 function hpkeGenerateKeyPair(kem = "x25519") {
+    if (kem === "x25519-ml-kem-768") {
+        const skX = ed25519_js_1.x25519.utils.randomSecretKey();
+        const pkX = ed25519_js_1.x25519.getPublicKey(skX);
+        const { publicKey: pkMlKem, secretKey: skMlKem } = ml_kem_js_1.ml_kem768.keygen();
+        return {
+            publicKey: bytesToHex(concat(pkX, pkMlKem)),
+            privateKey: bytesToHex(concat(skX, skMlKem)),
+        };
+    }
     const privateKey = kemRandomPrivateKey(kem);
     return {
         publicKey: bytesToHex(kemPublicKey(kem, privateKey)),
@@ -164,7 +220,10 @@ function hpkeGenerateKeyPair(kem = "x25519") {
 }
 function hpkeSeal(options) {
     const kem = options.suite?.kem ?? "x25519";
-    const sealed = hpkeSealWithEphemeral(options, kemRandomPrivateKey(kem));
+    const ephemeralPrivateKey = kem === "x25519-ml-kem-768"
+        ? ed25519_js_1.x25519.utils.randomSecretKey()
+        : kemRandomPrivateKey(kem);
+    const sealed = hpkeSealWithEphemeral(options, ephemeralPrivateKey);
     return {
         ciphertext: sealed.ciphertext,
         encapsulatedKey: sealed.encapsulatedKey,
@@ -178,7 +237,9 @@ function hpkeSealWithEphemeral(options, ephemeralPrivateKey) {
     const plaintext = hexToBytes(options.plaintext);
     const aad = options.aad ? hexToBytes(options.aad) : new Uint8Array(0);
     const inputs = scheduleInputs(options);
-    const { sharedSecret, enc } = dhkemEncap(kem, recipientPub, ephemeralPrivateKey, params);
+    const { sharedSecret, enc } = kem === "x25519-ml-kem-768"
+        ? hybridEncap(recipientPub, ephemeralPrivateKey, params)
+        : dhkemEncap(kem, recipientPub, ephemeralPrivateKey, params);
     const ks = keySchedule(params, sharedSecret, inputs);
     const ct = aeadSeal(aead, ks.key, ks.baseNonce, aad, plaintext);
     return {
@@ -199,7 +260,9 @@ function hpkeOpen(options) {
     const ciphertext = hexToBytes(options.ciphertext);
     const aad = options.aad ? hexToBytes(options.aad) : new Uint8Array(0);
     const inputs = scheduleInputs(options);
-    const sharedSecret = dhkemDecap(kem, enc, recipientPriv, params);
+    const sharedSecret = kem === "x25519-ml-kem-768"
+        ? hybridDecap(enc, recipientPriv, params)
+        : dhkemDecap(kem, enc, recipientPriv, params);
     const { key, baseNonce } = keySchedule(params, sharedSecret, inputs);
     const pt = aeadOpen(aead, key, baseNonce, aad, ciphertext);
     return { plaintext: bytesToHex(pt) };

package/dist/modern/index.d.ts

@@ -34,7 +34,7 @@ export declare const SUPPORTED_ALGORITHMS: {
     readonly kdf: readonly ["scrypt", "hkdf-sha256", "pbkdf2-sha256", "argon2id", "argon2i", "argon2d"];
     readonly mac: readonly ["hmac-sha256", "hmac-sha384", "hmac-sha512", "hmac-sha3-256", "hmac-sha3-512", "kmac-128", "kmac-256"];
     readonly signing: readonly ["ed25519", "ed448", "ecdsa-p256", "ecdsa-p384", "schnorr", "ml-dsa-44", "ml-dsa-65", "ml-dsa-87", "slh-dsa-sha2-128f", "slh-dsa-sha2-128s", "slh-dsa-sha2-192f", "slh-dsa-sha2-192s", "slh-dsa-sha2-256f", "slh-dsa-sha2-256s", "slh-dsa-shake-128f", "slh-dsa-shake-128s", "slh-dsa-shake-192f", "slh-dsa-shake-192s", "slh-dsa-shake-256f", "slh-dsa-shake-256s", "ed25519-ml-dsa-44", "ed25519-ml-dsa-65", "ed25519-ml-dsa-87", "fn-dsa-512", "fn-dsa-1024"];
-    readonly keyExchange: readonly ["x25519", "x448", "ecdh-p256", "ecdh-p384", "x25519-ml-kem-512", "x25519-ml-kem-768", "x25519-ml-kem-1024", "p256-ml-kem-768", "x448-ml-kem-1024", "hpke-x25519-chacha20", "hpke-x25519-aes128gcm", "hpke-p256-aes128gcm"];
+    readonly keyExchange: readonly ["x25519", "x448", "ecdh-p256", "ecdh-p384", "x25519-ml-kem-512", "x25519-ml-kem-768", "x25519-ml-kem-1024", "p256-ml-kem-768", "x448-ml-kem-1024", "hpke-x25519-chacha20", "hpke-x25519-aes128gcm", "hpke-p256-aes128gcm", "hpke-x25519-ml-kem-768-chacha20", "hpke-x25519-ml-kem-768-aes128gcm"];
     readonly postQuantum: readonly ["ml-kem-512", "ml-kem-768", "ml-kem-1024", "ml-dsa-44", "ml-dsa-65", "ml-dsa-87", "slh-dsa-sha2-128f", "slh-dsa-sha2-128s", "slh-dsa-sha2-192f", "slh-dsa-sha2-192s", "slh-dsa-sha2-256f", "slh-dsa-sha2-256s", "slh-dsa-shake-128f", "slh-dsa-shake-128s", "slh-dsa-shake-192f", "slh-dsa-shake-192s", "slh-dsa-shake-256f", "slh-dsa-shake-256s", "fn-dsa-512", "fn-dsa-1024"];
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/modern/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/modern/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/modern/index.ts"],"names":[],"mappings":"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"}

package/dist/modern/index.js

@@ -167,6 +167,8 @@ exports.SUPPORTED_ALGORITHMS = {
         "hpke-x25519-chacha20",
         "hpke-x25519-aes128gcm",
         "hpke-p256-aes128gcm",
+        "hpke-x25519-ml-kem-768-chacha20",
+        "hpke-x25519-ml-kem-768-aes128gcm",
     ],
     postQuantum: [
         "ml-kem-512",

package/dist/modern/kdf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kdf.d.ts","sourceRoot":"","sources":["../../src/modern/kdf.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,cAAc,qDAIjB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAG3D,MAAM,WAAW,gBAAgB;IAE/B,SAAS,EAAE,YAAY,CAAC;IAExB,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAC;IAE9B,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAE3B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,MAAM,CAAC,EAAE;QAEP,CAAC,CAAC,EAAE,MAAM,CAAC;QAEX,CAAC,CAAC,EAAE,MAAM,CAAC;QAEX,CAAC,CAAC,EAAE,MAAM,CAAC;QAEX,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;KAC5B,CAAC;CACH;AAGD,MAAM,WAAW,SAAS;IAExB,UAAU,EAAE,MAAM,CAAC;IAEnB,IAAI,EAAE,MAAM,CAAC;IAEb,SAAS,EAAE,YAAY,CAAC;IAExB,SAAS,EAAE,MAAM,CAAC;CACnB;AAuBD,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAyC9D"}
+{"version":3,"file":"kdf.d.ts","sourceRoot":"","sources":["../../src/modern/kdf.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,cAAc,qDAIjB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAG3D,MAAM,WAAW,gBAAgB;IAE/B,SAAS,EAAE,YAAY,CAAC;IAExB,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAC;IAE9B,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAE3B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,MAAM,CAAC,EAAE;QAEP,CAAC,CAAC,EAAE,MAAM,CAAC;QAEX,CAAC,CAAC,EAAE,MAAM,CAAC;QAEX,CAAC,CAAC,EAAE,MAAM,CAAC;QAEX,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;KAC5B,CAAC;CACH;AAGD,MAAM,WAAW,SAAS;IAExB,UAAU,EAAE,MAAM,CAAC;IAEnB,IAAI,EAAE,MAAM,CAAC;IAEb,SAAS,EAAE,YAAY,CAAC;IAExB,SAAS,EAAE,MAAM,CAAC;CACnB;AA4DD,wBAAgB,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CA4B9D"}

package/dist/modern/kdf.js

@@ -25,6 +25,25 @@ function toBytes(input, encoding = "utf8") {
     }
     return Buffer.from(input, "utf8");
 }
+function deriveScrypt(password, salt, keyLength, params) {
+    const N = params.N ?? 131072;
+    const r = params.r ?? 8;
+    const p = params.p ?? 1;
+    (0, cost_limits_1.checkScryptCosts)(N, r, p);
+    return (0, scrypt_js_1.scrypt)(password, salt, { N, r, p, dkLen: keyLength });
+}
+function deriveHkdf(password, salt, keyLength, params) {
+    const info = params.info ? toBytes(params.info, "utf8") : undefined;
+    return (0, hkdf_js_1.hkdf)(sha2_js_1.sha256, password, salt, info, keyLength);
+}
+function derivePbkdf2(password, salt, keyLength, params) {
+    const iterations = params.iterations ?? 600000;
+    (0, cost_limits_1.checkPbkdf2Iterations)(iterations);
+    return (0, pbkdf2_js_1.pbkdf2)(sha2_js_1.sha256, password, salt, {
+        c: iterations,
+        dkLen: keyLength,
+    });
+}
 function kdfDerive(options) {
     const password = toBytes(options.password, "utf8");
     const salt = options.salt ? toBytes(options.salt, "hex") : (0, utils_js_1.randomBytes)(16);
@@ -32,28 +51,15 @@ function kdfDerive(options) {
     const params = options.params ?? {};
     let derived;
     switch (options.algorithm) {
-        case "scrypt": {
-            const N = params.N ?? 131072;
-            const r = params.r ?? 8;
-            const p = params.p ?? 1;
-            (0, cost_limits_1.checkScryptCosts)(N, r, p);
-            derived = (0, scrypt_js_1.scrypt)(password, salt, { N, r, p, dkLen: keyLength });
+        case "scrypt":
+            derived = deriveScrypt(password, salt, keyLength, params);
             break;
-        }
-        case "hkdf-sha256": {
-            const info = params.info ? toBytes(params.info, "utf8") : undefined;
-            derived = (0, hkdf_js_1.hkdf)(sha2_js_1.sha256, password, salt, info, keyLength);
+        case "hkdf-sha256":
+            derived = deriveHkdf(password, salt, keyLength, params);
             break;
-        }
-        case "pbkdf2-sha256": {
-            const iterations = params.iterations ?? 600000;
-            (0, cost_limits_1.checkPbkdf2Iterations)(iterations);
-            derived = (0, pbkdf2_js_1.pbkdf2)(sha2_js_1.sha256, password, salt, {
-                c: iterations,
-                dkLen: keyLength,
-            });
+        case "pbkdf2-sha256":
+            derived = derivePbkdf2(password, salt, keyLength, params);
             break;
-        }
         default:
             throw new Error(`Unsupported KDF algorithm: ${options.algorithm}`);
     }

package/dist/streaming/index.d.ts

@@ -2,6 +2,10 @@ export { createHasher, STREAM_HASH_ALGORITHMS } from "./stream-hash";
 export type { StreamingHasher, StreamHashAlgorithm } from "./stream-hash";
 export { streamEncrypt, streamDecrypt } from "./stream-aead";
 export type { StreamEncryptOptions, StreamEncryptResult, StreamDecryptOptions, } from "./stream-aead";
-export { createEncryptStream, createDecryptStream, createHashStream, WEB_STREAM_HASH_ALGORITHMS, } from "./web-streams";
-export type { WebStreamHashAlgorithm, HashStreamResult, EncryptStreamOptions, DecryptStreamOptions, CryptoTransformStream, } from "./web-streams";
+export { createEncryptStream, createDecryptStream, createHashStream, createPqEncryptStream, createPqDecryptStream, createMultiPqEncryptStream, createMultiPqDecryptStream, WEB_STREAM_HASH_ALGORITHMS, } from "./web-streams";
+export type { WebStreamHashAlgorithm, HashStreamResult, EncryptStreamOptions, DecryptStreamOptions, PqEncryptStreamOptions, PqDecryptStreamOptions, MultiPqEncryptStreamOptions, MultiPqDecryptStreamOptions, CryptoTransformStream, } from "./web-streams";
+export { streamPqEncrypt, streamPqDecrypt, PQ_STREAM_HEADER_LEN, } from "./stream-pq-aead";
+export type { StreamPqEncryptOptions, StreamPqEncryptResult, StreamPqDecryptOptions, } from "./stream-pq-aead";
+export { streamMultiPqEncrypt, streamMultiPqDecrypt, MULTI_PQ_STREAM_MAGIC, MULTI_PQ_STREAM_VERSION, MULTI_PQ_PREFIX_LEN, CEK_LEN, WRAPPED_CEK_LEN, SLOT_FIXED_OVERHEAD, } from "./stream-multi-pq-aead";
+export type { MultiPqRecipient, StreamMultiPqEncryptOptions, StreamMultiPqEncryptResult, StreamMultiPqDecryptOptions, StreamMultiPqDecryptResult, } from "./stream-multi-pq-aead";
 //# sourceMappingURL=index.d.ts.map

package/dist/streaming/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/streaming/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAErE,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7D,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,0BAA0B,GAC3B,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,sBAAsB,EACtB,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/streaming/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAErE,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7D,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,sBAAsB,EACtB,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,EAC3B,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAE1B,YAAY,EACV,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,EACnB,OAAO,EACP,eAAe,EACf,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAEhC,YAAY,EACV,gBAAgB,EAChB,2BAA2B,EAC3B,0BAA0B,EAC1B,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,wBAAwB,CAAC"}