@lindorm/aes 0.5.5 → 0.6.1

package/dist/utils/is-aes.js

@@ -6,10 +6,6 @@ const isAesBufferData = (data) => Object.values(data).some((x) => (0, is_1.isBuf
 exports.isAesBufferData = isAesBufferData;
 const isAesSerialisedData = (options) => Object.values(options).every((x) => !(0, is_1.isBuffer)(x));
 exports.isAesSerialisedData = isAesSerialisedData;
-const isAesTokenised = (string) => (0, is_1.isString)(string) &&
-    string.startsWith("$") &&
-    string.endsWith("$") &&
-    string.includes("v=") &&
-    string.includes("alg=");
+const isAesTokenised = (string) => (0, is_1.isString)(string) && string.startsWith("aes:");
 exports.isAesTokenised = isAesTokenised;
 //# sourceMappingURL=is-aes.js.map

package/dist/utils/is-aes.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-aes.js","sourceRoot":"","sources":["../../src/utils/is-aes.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AAG1C,MAAM,eAAe,GAAG,CAC7B,IAAmD,EACtB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC,CAAC;AAFlE,QAAA,eAAe,mBAEmD;AAExE,MAAM,mBAAmB,GAAG,CACjC,OAAsD,EAClB,EAAE,CACtC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC,CAAC;AAHvC,QAAA,mBAAmB,uBAGoB;AAE7C,MAAM,cAAc,GAAG,CAAC,MAAc,EAAW,EAAE,CACxD,IAAA,aAAQ,EAAC,MAAM,CAAC;IAChB,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;IACtB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;IACpB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;IACrB,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AALb,QAAA,cAAc,kBAKD"}
+{"version":3,"file":"is-aes.js","sourceRoot":"","sources":["../../src/utils/is-aes.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AAG1C,MAAM,eAAe,GAAG,CAC7B,IAAmD,EACtB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC,CAAC;AAFlE,QAAA,eAAe,mBAEmD;AAExE,MAAM,mBAAmB,GAAG,CACjC,OAAsD,EAClB,EAAE,CACtC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC,CAAC;AAHvC,QAAA,mBAAmB,uBAGoB;AAE7C,MAAM,cAAc,GAAG,CAAC,MAAc,EAAW,EAAE,CACxD,IAAA,aAAQ,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AADnC,QAAA,cAAc,kBACqB"}

package/dist/utils/parse-aes.js

@@ -6,12 +6,12 @@ const errors_1 = require("../errors");
 const is_aes_1 = require("./is-aes");
 const private_1 = require("./private");
 const parseAes = (data) => {
-    if ((0, is_1.isString)(data) && !(0, is_aes_1.isAesTokenised)(data)) {
-        return (0, private_1.parseEncodedAesString)(data);
-    }
     if ((0, is_1.isString)(data) && (0, is_aes_1.isAesTokenised)(data)) {
         return (0, private_1.parseTokenisedAesString)(data);
     }
+    if ((0, is_1.isString)(data) && !(0, is_aes_1.isAesTokenised)(data)) {
+        return (0, private_1.parseEncodedAesString)(data);
+    }
     if ((0, is_1.isObject)(data) && (0, is_aes_1.isAesBufferData)(data)) {
         return data;
     }

package/dist/utils/parse-aes.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-aes.js","sourceRoot":"","sources":["../../src/utils/parse-aes.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AACjD,sCAAqC;AAErC,qCAAgF;AAChF,uCAImB;AAEZ,MAAM,QAAQ,GAAG,CACtB,IAA4D,EACvC,EAAE;IACvB,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAA,+BAAqB,EAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAA,iCAAuB,EAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,wBAAe,EAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,4BAAmB,EAAC,IAAI,CAAC,EAAE,CAAC;QAChD,OAAO,IAAA,kCAAwB,EAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,IAAI,iBAAQ,CAAC,kBAAkB,CAAC,CAAC;AACzC,CAAC,CAAC;AApBW,QAAA,QAAQ,YAoBnB"}
+{"version":3,"file":"parse-aes.js","sourceRoot":"","sources":["../../src/utils/parse-aes.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AACjD,sCAAqC;AAErC,qCAAgF;AAChF,uCAImB;AAEZ,MAAM,QAAQ,GAAG,CACtB,IAA4D,EACvC,EAAE;IACvB,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAA,iCAAuB,EAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAA,+BAAqB,EAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,wBAAe,EAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,4BAAmB,EAAC,IAAI,CAAC,EAAE,CAAC;QAChD,OAAO,IAAA,kCAAwB,EAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,IAAI,iBAAQ,CAAC,kBAAkB,CAAC,CAAC;AACzC,CAAC,CAAC;AApBW,QAAA,QAAQ,YAoBnB"}

package/dist/utils/private/aes-header.d.ts

@@ -0,0 +1,42 @@
+import { KryptosAlgorithm, KryptosEncryption } from "@lindorm/kryptos";
+import { AesContentType, PublicEncryptionJwk } from "../../types";
+export type AesHeaderInput = {
+    algorithm: KryptosAlgorithm;
+    contentType: AesContentType;
+    encryption: KryptosEncryption;
+    keyId: string;
+    pbkdfIterations?: number;
+    pbkdfSalt?: Buffer;
+    publicEncryptionIv?: Buffer;
+    publicEncryptionJwk?: PublicEncryptionJwk;
+    publicEncryptionTag?: Buffer;
+};
+export type AesHeader = {
+    alg: KryptosAlgorithm;
+    cty: AesContentType;
+    enc: KryptosEncryption;
+    epk?: PublicEncryptionJwk;
+    iv?: string;
+    kid: string;
+    p2c?: number;
+    p2s?: string;
+    tag?: string;
+    v: string;
+};
+export declare const buildAesHeader: (options: AesHeaderInput) => AesHeader;
+export declare const encodeAesHeader: (header: AesHeader) => string;
+export declare const decodeAesHeader: (headerB64: string) => AesHeader;
+export declare const computeAad: (headerB64: string) => Buffer;
+export declare const headerToDecryptionParams: (header: AesHeader) => {
+    algorithm: KryptosAlgorithm;
+    contentType: AesContentType;
+    encryption: KryptosEncryption;
+    keyId: string;
+    pbkdfIterations: number | undefined;
+    pbkdfSalt: Buffer | undefined;
+    publicEncryptionIv: Buffer | undefined;
+    publicEncryptionJwk: PublicEncryptionJwk | undefined;
+    publicEncryptionTag: Buffer | undefined;
+    version: string;
+};
+//# sourceMappingURL=aes-header.d.ts.map

package/dist/utils/private/aes-header.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aes-header.d.ts","sourceRoot":"","sources":["../../../src/utils/private/aes-header.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGvE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGlE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,WAAW,EAAE,cAAc,CAAC;IAC5B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,gBAAgB,CAAC;IACtB,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,iBAAiB,CAAC;IACvB,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAYF,eAAO,MAAM,cAAc,GAAI,SAAS,cAAc,KAAG,SAgBrD,CAAC;AAEL,eAAO,MAAM,eAAe,GAAI,QAAQ,SAAS,KAAG,MAGnD,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,WAAW,MAAM,KAAG,SAoBnD,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,WAAW,MAAM,KAAG,MAAyC,CAAC;AAEzF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,SAAS,KAChB;IACD,SAAS,EAAE,gBAAgB,CAAC;IAC5B,WAAW,EAAE,cAAc,CAAC;IAC5B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,mBAAmB,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACrD,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC;CAYhB,CAAC"}

package/dist/utils/private/aes-header.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.headerToDecryptionParams = exports.computeAad = exports.decodeAesHeader = exports.encodeAesHeader = exports.buildAesHeader = void 0;
+const b64_1 = require("@lindorm/b64");
+const private_1 = require("../../constants/private");
+const errors_1 = require("../../errors");
+const validate_version_1 = require("./validate-version");
+const sortKeys = (obj) => {
+    const sorted = {};
+    for (const key of Object.keys(obj).sort()) {
+        if (obj[key] !== undefined) {
+            sorted[key] = obj[key];
+        }
+    }
+    return sorted;
+};
+const buildAesHeader = (options) => sortKeys({
+    alg: options.algorithm,
+    cty: options.contentType,
+    enc: options.encryption,
+    epk: options.publicEncryptionJwk,
+    iv: options.publicEncryptionIv
+        ? b64_1.B64.encode(options.publicEncryptionIv, "b64u")
+        : undefined,
+    kid: options.keyId,
+    p2c: options.pbkdfIterations,
+    p2s: options.pbkdfSalt ? b64_1.B64.encode(options.pbkdfSalt, "b64u") : undefined,
+    tag: options.publicEncryptionTag
+        ? b64_1.B64.encode(options.publicEncryptionTag, "b64u")
+        : undefined,
+    v: private_1.AES_FORMAT_VERSION,
+});
+exports.buildAesHeader = buildAesHeader;
+const encodeAesHeader = (header) => {
+    const json = JSON.stringify(header);
+    return b64_1.B64.encode(Buffer.from(json, "utf8"), "b64u");
+};
+exports.encodeAesHeader = encodeAesHeader;
+const decodeAesHeader = (headerB64) => {
+    try {
+        const json = b64_1.B64.toBuffer(headerB64, "b64u").toString("utf8");
+        const parsed = JSON.parse(json);
+        if (!parsed.alg || !parsed.enc || !parsed.v) {
+            throw new errors_1.AesError("Invalid AES header: missing required fields", {
+                debug: { parsed },
+            });
+        }
+        (0, validate_version_1.validateAesVersion)(parsed.v);
+        return parsed;
+    }
+    catch (error) {
+        if (error instanceof errors_1.AesError)
+            throw error;
+        throw new errors_1.AesError("Failed to decode AES header", {
+            error: error,
+        });
+    }
+};
+exports.decodeAesHeader = decodeAesHeader;
+const computeAad = (headerB64) => Buffer.from(headerB64, "ascii");
+exports.computeAad = computeAad;
+const headerToDecryptionParams = (header) => ({
+    algorithm: header.alg,
+    contentType: header.cty,
+    encryption: header.enc,
+    keyId: header.kid,
+    pbkdfIterations: header.p2c,
+    pbkdfSalt: header.p2s ? b64_1.B64.toBuffer(header.p2s, "b64u") : undefined,
+    publicEncryptionIv: header.iv ? b64_1.B64.toBuffer(header.iv, "b64u") : undefined,
+    publicEncryptionJwk: header.epk,
+    publicEncryptionTag: header.tag ? b64_1.B64.toBuffer(header.tag, "b64u") : undefined,
+    version: header.v,
+});
+exports.headerToDecryptionParams = headerToDecryptionParams;
+//# sourceMappingURL=aes-header.js.map

package/dist/utils/private/aes-header.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aes-header.js","sourceRoot":"","sources":["../../../src/utils/private/aes-header.ts"],"names":[],"mappings":"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"}

package/dist/utils/private/calculate/calculate-content-encryption-key-size.js

@@ -14,11 +14,11 @@ const calculateContentEncryptionKeySize = (encryption) => {
         case "A256GCM":
             return 32;
         case "A128CBC-HS256":
-            return 48;
+            return 32;
         case "A192CBC-HS384":
-            return 72;
+            return 48;
         case "A256CBC-HS512":
-            return 96;
+            return 64;
         default:
             throw new errors_1.AesError("Unsupported encryption", { debug: { encryption } });
     }

package/dist/utils/private/calculate/calculate-key-wrap-encryption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-key-wrap-encryption.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/calculate/calculate-key-wrap-encryption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,KAAK,iBAAiB,GAClB,aAAa,GACb,aAAa,GACb,aAAa,GACb,aAAa,GACb,aAAa,GACb,aAAa,CAAC;AAElB,eAAO,MAAM,0BAA0B,GAAI,SAAS,QAAQ,KAAG,iBAgC9D,CAAC"}
+{"version":3,"file":"calculate-key-wrap-encryption.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/calculate/calculate-key-wrap-encryption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,KAAK,iBAAiB,GAClB,aAAa,GACb,aAAa,GACb,aAAa,GACb,aAAa,GACb,aAAa,GACb,aAAa,CAAC;AAElB,eAAO,MAAM,0BAA0B,GAAI,SAAS,QAAQ,KAAG,iBAgC9D,CAAC"}

package/dist/utils/private/calculate/calculate-key-wrap-encryption.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateKeyWrapEncryption = void 0;
+const errors_1 = require("../../../errors");
 const calculateKeyWrapEncryption = (kryptos) => {
     switch (kryptos.algorithm) {
         case "A128KW":
@@ -25,7 +26,7 @@ const calculateKeyWrapEncryption = (kryptos) => {
         case "ECDH-ES+A256GCMKW":
             return "aes-256-gcm";
         default:
-            throw new Error("Unsupported keywrap encryption");
+            throw new errors_1.AesError("Unsupported keywrap encryption");
     }
 };
 exports.calculateKeyWrapEncryption = calculateKeyWrapEncryption;

package/dist/utils/private/calculate/calculate-key-wrap-encryption.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-key-wrap-encryption.js","sourceRoot":"","sources":["../../../../src/utils/private/calculate/calculate-key-wrap-encryption.ts"],"names":[],"mappings":";;;AAUO,MAAM,0BAA0B,GAAG,CAAC,OAAiB,EAAqB,EAAE;IACjF,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1B,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB;YACvB,OAAO,aAAa,CAAC;QAEvB,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB;YACvB,OAAO,aAAa,CAAC;QAEvB,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB;YACvB,OAAO,aAAa,CAAC;QAEvB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB;YACtB,OAAO,aAAa,CAAC;QAEvB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB;YACtB,OAAO,aAAa,CAAC;QAEvB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB;YACtB,OAAO,aAAa,CAAC;QAEvB;YACE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACtD,CAAC;AACH,CAAC,CAAC;AAhCW,QAAA,0BAA0B,8BAgCrC"}
+{"version":3,"file":"calculate-key-wrap-encryption.js","sourceRoot":"","sources":["../../../../src/utils/private/calculate/calculate-key-wrap-encryption.ts"],"names":[],"mappings":";;;AACA,4CAA2C;AAUpC,MAAM,0BAA0B,GAAG,CAAC,OAAiB,EAAqB,EAAE;IACjF,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1B,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB;YACvB,OAAO,aAAa,CAAC;QAEvB,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB;YACvB,OAAO,aAAa,CAAC;QAEvB,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB;YACvB,OAAO,aAAa,CAAC;QAEvB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB;YACtB,OAAO,aAAa,CAAC;QAEvB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB;YACtB,OAAO,aAAa,CAAC;QAEvB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB;YACtB,OAAO,aAAa,CAAC;QAEvB;YACE,MAAM,IAAI,iBAAQ,CAAC,gCAAgC,CAAC,CAAC;IACzD,CAAC;AACH,CAAC,CAAC;AAhCW,QAAA,0BAA0B,8BAgCrC"}

package/dist/utils/private/content.js

@@ -10,7 +10,7 @@ const calculateContentType = (content) => {
     if ((0, is_1.isBuffer)(content)) {
         return "application/octet-stream";
     }
-    if ((0, is_1.isArray)(content) || (0, is_1.isNumber)(content) || (0, is_1.isObject)(content)) {
+    if ((0, is_1.isArray)(content) || (0, is_1.isBoolean)(content) || (0, is_1.isNumber)(content) || (0, is_1.isObject)(content)) {
         return "application/json";
     }
     throw new errors_1.AesError("Invalid content type", {

package/dist/utils/private/content.js.map

@@ -1 +1 @@
-{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/utils/private/content.ts"],"names":[],"mappings":";;;AAAA,oCAA8E;AAC9E,yCAAwC;AAGjC,MAAM,oBAAoB,GAAG,CAAC,OAAY,EAAkB,EAAE;IACnE,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QACtB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QACtB,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED,IAAI,IAAA,YAAO,EAAC,OAAO,CAAC,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,EAAE;QACzC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,OAAO,EAAE;KACzC,CAAC,CAAC;AACL,CAAC,CAAC;AAhBW,QAAA,oBAAoB,wBAgB/B;AAEK,MAAM,eAAe,GAAG,CAAC,OAAY,EAAE,WAA2B,EAAU,EAAE;IACnF,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,kBAAkB;YACrB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QAEtD,KAAK,0BAA0B;YAC7B,OAAO,OAAO,CAAC;QAEjB,KAAK,YAAY;YACf,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAEtC;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,EAAE;gBACzC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,OAAO,EAAE;aACzC,CAAC,CAAC;IACP,CAAC;AACH,CAAC,CAAC;AAhBW,QAAA,eAAe,mBAgB1B;AAEK,MAAM,YAAY,GAAG,CAC1B,OAAe,EACf,cAA8B,YAAY,EACvC,EAAE;IACL,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,kBAAkB;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAM,CAAC;QAEnD,KAAK,0BAA0B;YAC7B,OAAO,OAAY,CAAC;QAEtB,KAAK,YAAY;YACf,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAM,CAAC;QAEvC;YACE,MAAM,IAAI,iBAAQ,CAAC,yBAAyB,EAAE;gBAC5C,KAAK,EAAE,EAAE,WAAW,EAAE;aACvB,CAAC,CAAC;IACP,CAAC;AACH,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB"}
+{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/utils/private/content.ts"],"names":[],"mappings":";;;AAAA,oCAAyF;AACzF,yCAAwC;AAGjC,MAAM,oBAAoB,GAAG,CAAC,OAAY,EAAkB,EAAE;IACnE,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QACtB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QACtB,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED,IAAI,IAAA,YAAO,EAAC,OAAO,CAAC,IAAI,IAAA,cAAS,EAAC,OAAO,CAAC,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;QACrF,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,EAAE;QACzC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,OAAO,EAAE;KACzC,CAAC,CAAC;AACL,CAAC,CAAC;AAhBW,QAAA,oBAAoB,wBAgB/B;AAEK,MAAM,eAAe,GAAG,CAAC,OAAY,EAAE,WAA2B,EAAU,EAAE;IACnF,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,kBAAkB;YACrB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QAEtD,KAAK,0BAA0B;YAC7B,OAAO,OAAO,CAAC;QAEjB,KAAK,YAAY;YACf,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAEtC;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,EAAE;gBACzC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,OAAO,EAAE;aACzC,CAAC,CAAC;IACP,CAAC;AACH,CAAC,CAAC;AAhBW,QAAA,eAAe,mBAgB1B;AAEK,MAAM,YAAY,GAAG,CAC1B,OAAe,EACf,cAA8B,YAAY,EACvC,EAAE;IACL,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,kBAAkB;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAM,CAAC;QAEnD,KAAK,0BAA0B;YAC7B,OAAO,OAAY,CAAC;QAEtB,KAAK,YAAY;YACf,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAM,CAAC;QAEvC;YACE,MAAM,IAAI,iBAAQ,CAAC,yBAAyB,EAAE;gBAC5C,KAAK,EAAE,EAAE,WAAW,EAAE;aACvB,CAAC,CAAC;IACP,CAAC;AACH,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB"}

package/dist/utils/private/data/auth-tag-hmac.d.ts

@@ -1,4 +1,4 @@
 import { CreateHmacAuthTag, VerifyHmacAuthTag } from "../../../types/private";
-export declare const createHmacAuthTag: ({ content, hashKey, initialisationVector, encryption, }: CreateHmacAuthTag) => Buffer;
-export declare const assertHmacAuthTag: ({ authTag, content, encryption, hashKey, initialisationVector, }: VerifyHmacAuthTag) => void;
+export declare const createHmacAuthTag: ({ aad, content, hashKey, initialisationVector, encryption, }: CreateHmacAuthTag) => Buffer;
+export declare const assertHmacAuthTag: ({ aad, authTag, content, encryption, hashKey, initialisationVector, }: VerifyHmacAuthTag) => void;
 //# sourceMappingURL=auth-tag-hmac.d.ts.map

package/dist/utils/private/data/auth-tag-hmac.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-tag-hmac.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag-hmac.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAkB9E,eAAO,MAAM,iBAAiB,GAAI,yDAK/B,iBAAiB,KAAG,MAOtB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,kEAM/B,iBAAiB,KAAG,IAWtB,CAAC"}
+{"version":3,"file":"auth-tag-hmac.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag-hmac.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAkB9E,eAAO,MAAM,iBAAiB,GAAI,8DAM/B,iBAAiB,KAAG,MAiBtB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,uEAO/B,iBAAiB,KAAG,IAYtB,CAAC"}

package/dist/utils/private/data/auth-tag-hmac.js

@@ -15,21 +15,29 @@ const shaHash = (encryption) => {
             throw new errors_1.AesError("Unexpected algorithm");
     }
 };
-const createHmacAuthTag = ({ content, hashKey, initialisationVector, encryption, }) => {
+const createHmacAuthTag = ({ aad, content, hashKey, initialisationVector, encryption, }) => {
     const hmac = (0, crypto_1.createHmac)(shaHash(encryption), hashKey);
+    if (aad) {
+        hmac.update(aad);
+    }
     hmac.update(initialisationVector);
     hmac.update(content);
-    return hmac.digest();
+    const al = Buffer.alloc(8);
+    al.writeBigUInt64BE(BigInt((aad?.length ?? 0) * 8));
+    hmac.update(al);
+    const fullTag = hmac.digest();
+    return fullTag.subarray(0, fullTag.length / 2);
 };
 exports.createHmacAuthTag = createHmacAuthTag;
-const assertHmacAuthTag = ({ authTag, content, encryption, hashKey, initialisationVector, }) => {
+const assertHmacAuthTag = ({ aad, authTag, content, encryption, hashKey, initialisationVector, }) => {
     const generated = (0, exports.createHmacAuthTag)({
+        aad,
         content,
         encryption,
         hashKey,
         initialisationVector,
     });
-    if (Buffer.compare(generated, authTag) === 0)
+    if (generated.length === authTag.length && (0, crypto_1.timingSafeEqual)(generated, authTag))
         return;
     throw new errors_1.AesError("Auth tag verification failed");
 };

package/dist/utils/private/data/auth-tag-hmac.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-tag-hmac.js","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag-hmac.ts"],"names":[],"mappings":";;;AAEA,mCAAoC;AACpC,4CAA2C;AAG3C,MAAM,OAAO,GAAG,CAAC,UAA6B,EAAgB,EAAE;IAC9D,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe;YAClB,OAAO,QAAQ,CAAC;QAElB,KAAK,eAAe;YAClB,OAAO,QAAQ,CAAC;QAElB,KAAK,eAAe;YAClB,OAAO,QAAQ,CAAC;QAElB;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAChC,OAAO,EACP,OAAO,EACP,oBAAoB,EACpB,UAAU,GACQ,EAAU,EAAE;IAC9B,MAAM,IAAI,GAAG,IAAA,mBAAU,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAEtD,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAErB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;AACvB,CAAC,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,OAAO,EACP,oBAAoB,GACF,EAAQ,EAAE;IAC5B,MAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC;QAClC,OAAO;QACP,UAAU;QACV,OAAO;QACP,oBAAoB;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO;IAErD,MAAM,IAAI,iBAAQ,CAAC,8BAA8B,CAAC,CAAC;AACrD,CAAC,CAAC;AAjBW,QAAA,iBAAiB,qBAiB5B"}
+{"version":3,"file":"auth-tag-hmac.js","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag-hmac.ts"],"names":[],"mappings":";;;AAEA,mCAAqD;AACrD,4CAA2C;AAG3C,MAAM,OAAO,GAAG,CAAC,UAA6B,EAAgB,EAAE;IAC9D,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe;YAClB,OAAO,QAAQ,CAAC;QAElB,KAAK,eAAe;YAClB,OAAO,QAAQ,CAAC;QAElB,KAAK,eAAe;YAClB,OAAO,QAAQ,CAAC;QAElB;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAChC,GAAG,EACH,OAAO,EACP,OAAO,EACP,oBAAoB,EACpB,UAAU,GACQ,EAAU,EAAE;IAC9B,MAAM,IAAI,GAAG,IAAA,mBAAU,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAKtD,IAAI,GAAG,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACrB,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9B,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAChC,GAAG,EACH,OAAO,EACP,OAAO,EACP,UAAU,EACV,OAAO,EACP,oBAAoB,GACF,EAAQ,EAAE;IAC5B,MAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC;QAClC,GAAG;QACH,OAAO;QACP,UAAU;QACV,OAAO;QACP,oBAAoB;KACrB,CAAC,CAAC;IAEH,IAAI,SAAS,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,IAAI,IAAA,wBAAe,EAAC,SAAS,EAAE,OAAO,CAAC;QAAE,OAAO;IAEvF,MAAM,IAAI,iBAAQ,CAAC,8BAA8B,CAAC,CAAC;AACrD,CAAC,CAAC;AAnBW,QAAA,iBAAiB,qBAmB5B"}

package/dist/utils/private/data/auth-tag.d.ts

@@ -1,4 +1,4 @@
 import { GetAuthTagOptions, SetAuthTagOptions } from "../../../types/private";
-export declare const createAuthTag: ({ encryption, cipher, content, hashKey, initialisationVector, }: GetAuthTagOptions) => Buffer;
-export declare const assertAuthTag: ({ authTag, content, hashKey, decipher, encryption, initialisationVector, }: SetAuthTagOptions) => void;
+export declare const createAuthTag: ({ aad, encryption, cipher, content, hashKey, initialisationVector, }: GetAuthTagOptions) => Buffer;
+export declare const assertAuthTag: ({ aad, authTag, content, hashKey, decipher, encryption, initialisationVector, }: SetAuthTagOptions) => void;
 //# sourceMappingURL=auth-tag.d.ts.map

package/dist/utils/private/data/auth-tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-tag.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG9E,eAAO,MAAM,aAAa,GAAI,iEAM3B,iBAAiB,KAAG,MAoBtB,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,4EAO3B,iBAAiB,KAAG,IA2BtB,CAAC"}
+{"version":3,"file":"auth-tag.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG9E,eAAO,MAAM,aAAa,GAAI,sEAO3B,iBAAiB,KAAG,MAqBtB,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,iFAQ3B,iBAAiB,KAAG,IA4BtB,CAAC"}

package/dist/utils/private/data/auth-tag.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertAuthTag = exports.createAuthTag = void 0;
 const errors_1 = require("../../../errors");
 const auth_tag_hmac_1 = require("./auth-tag-hmac");
-const createAuthTag = ({ encryption, cipher, content, hashKey, initialisationVector, }) => {
+const createAuthTag = ({ aad, encryption, cipher, content, hashKey, initialisationVector, }) => {
     switch (encryption) {
         case "A128CBC-HS256":
         case "A192CBC-HS384":
         case "A256CBC-HS512":
             return (0, auth_tag_hmac_1.createHmacAuthTag)({
+                aad,
                 content,
                 encryption,
                 hashKey,
@@ -23,7 +24,7 @@ const createAuthTag = ({ encryption, cipher, content, hashKey, initialisationVec
     }
 };
 exports.createAuthTag = createAuthTag;
-const assertAuthTag = ({ authTag, content, hashKey, decipher, encryption, initialisationVector, }) => {
+const assertAuthTag = ({ aad, authTag, content, hashKey, decipher, encryption, initialisationVector, }) => {
     if (!authTag) {
         throw new errors_1.AesError("Auth tag is missing");
     }
@@ -32,6 +33,7 @@ const assertAuthTag = ({ authTag, content, hashKey, decipher, encryption, initia
         case "A192CBC-HS384":
         case "A256CBC-HS512":
             (0, auth_tag_hmac_1.assertHmacAuthTag)({
+                aad,
                 authTag,
                 content,
                 encryption,

package/dist/utils/private/data/auth-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-tag.js","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag.ts"],"names":[],"mappings":";;;AACA,4CAA2C;AAE3C,mDAAuE;AAEhE,MAAM,aAAa,GAAG,CAAC,EAC5B,UAAU,EACV,MAAM,EACN,OAAO,EACP,OAAO,EACP,oBAAoB,GACF,EAAU,EAAE;IAC9B,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,IAAA,iCAAiB,EAAC;gBACvB,OAAO;gBACP,UAAU;gBACV,OAAO;gBACP,oBAAoB;aACrB,CAAC,CAAC;QAEL,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,OAAQ,MAAoB,CAAC,UAAU,EAAE,CAAC;QAE5C;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AA1BW,QAAA,aAAa,iBA0BxB;AAEK,MAAM,aAAa,GAAG,CAAC,EAC5B,OAAO,EACP,OAAO,EACP,OAAO,EACP,QAAQ,EACR,UAAU,EACV,oBAAoB,GACF,EAAQ,EAAE;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,iBAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe;YAClB,IAAA,iCAAiB,EAAC;gBAChB,OAAO;gBACP,OAAO;gBACP,UAAU;gBACV,OAAO;gBACP,oBAAoB;aACrB,CAAC,CAAC;YACH,OAAO;QAET,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACX,QAAwB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC9C,OAAO;QAET;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAlCW,QAAA,aAAa,iBAkCxB"}
+{"version":3,"file":"auth-tag.js","sourceRoot":"","sources":["../../../../src/utils/private/data/auth-tag.ts"],"names":[],"mappings":";;;AACA,4CAA2C;AAE3C,mDAAuE;AAEhE,MAAM,aAAa,GAAG,CAAC,EAC5B,GAAG,EACH,UAAU,EACV,MAAM,EACN,OAAO,EACP,OAAO,EACP,oBAAoB,GACF,EAAU,EAAE;IAC9B,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,IAAA,iCAAiB,EAAC;gBACvB,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,OAAO;gBACP,oBAAoB;aACrB,CAAC,CAAC;QAEL,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,OAAQ,MAAoB,CAAC,UAAU,EAAE,CAAC;QAE5C;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AA5BW,QAAA,aAAa,iBA4BxB;AAEK,MAAM,aAAa,GAAG,CAAC,EAC5B,GAAG,EACH,OAAO,EACP,OAAO,EACP,OAAO,EACP,QAAQ,EACR,UAAU,EACV,oBAAoB,GACF,EAAQ,EAAE;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,iBAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe;YAClB,IAAA,iCAAiB,EAAC;gBAChB,GAAG;gBACH,OAAO;gBACP,OAAO;gBACP,UAAU;gBACV,OAAO;gBACP,oBAAoB;aACrB,CAAC,CAAC;YACH,OAAO;QAET,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACX,QAAwB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC9C,OAAO;QAET;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AApCW,QAAA,aAAa,iBAoCxB"}

package/dist/utils/private/data/split-content-encryption-key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"split-content-encryption-key.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/data/split-content-encryption-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAIrD,KAAK,MAAM,GAAG;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAqBF,eAAO,MAAM,yBAAyB,GACpC,YAAY,iBAAiB,EAC7B,sBAAsB,MAAM,KAC3B,MAcF,CAAC"}
+{"version":3,"file":"split-content-encryption-key.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/data/split-content-encryption-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAIrD,KAAK,MAAM,GAAG;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAqBF,eAAO,MAAM,yBAAyB,GACpC,YAAY,iBAAiB,EAC7B,sBAAsB,MAAM,KAC3B,MAmBF,CAAC"}

package/dist/utils/private/data/split-content-encryption-key.js

@@ -19,10 +19,14 @@ const encryptionKeyLength = (encryption) => {
 };
 const splitContentEncryptionKey = (encryption, contentEncryptionKey) => {
     const keyLength = encryptionKeyLength(encryption);
+    if (encryption.includes("CBC")) {
+        const hashKey = contentEncryptionKey.subarray(0, keyLength);
+        const encryptionKey = contentEncryptionKey.subarray(keyLength);
+        return { encryptionKey, hashKey };
+    }
     const encryptionKey = contentEncryptionKey.subarray(0, keyLength);
     const hashKey = contentEncryptionKey.subarray(keyLength);
-    if (hashKey.length &&
-        (encryption === "A128GCM" || encryption === "A192GCM" || encryption === "A256GCM")) {
+    if (hashKey.length) {
         throw new errors_1.AesError("Unexpected hash key");
     }
     return { encryptionKey, hashKey };

package/dist/utils/private/data/split-content-encryption-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"split-content-encryption-key.js","sourceRoot":"","sources":["../../../../src/utils/private/data/split-content-encryption-key.ts"],"names":[],"mappings":";;;AAEA,4CAA2C;AAO3C,MAAM,mBAAmB,GAAG,CAAC,UAA6B,EAAgB,EAAE;IAC1E,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,EAAE,CAAC;QAEZ,KAAK,eAAe,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,EAAE,CAAC;QAEZ,KAAK,eAAe,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,EAAE,CAAC;QAEZ;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,yBAAyB,GAAG,CACvC,UAA6B,EAC7B,oBAA4B,EACpB,EAAE;IACV,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAElD,MAAM,aAAa,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEzD,IACE,OAAO,CAAC,MAAM;QACd,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,CAAC,EAClF,CAAC;QACD,MAAM,IAAI,iBAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;AACpC,CAAC,CAAC;AAjBW,QAAA,yBAAyB,6BAiBpC"}
+{"version":3,"file":"split-content-encryption-key.js","sourceRoot":"","sources":["../../../../src/utils/private/data/split-content-encryption-key.ts"],"names":[],"mappings":";;;AAEA,4CAA2C;AAO3C,MAAM,mBAAmB,GAAG,CAAC,UAA6B,EAAgB,EAAE;IAC1E,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,eAAe,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,EAAE,CAAC;QAEZ,KAAK,eAAe,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,EAAE,CAAC;QAEZ,KAAK,eAAe,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,EAAE,CAAC;QAEZ;YACE,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,yBAAyB,GAAG,CACvC,UAA6B,EAC7B,oBAA4B,EACpB,EAAE;IACV,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAElD,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAE/B,MAAM,OAAO,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAC5D,MAAM,aAAa,GAAG,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;IACpC,CAAC;IAGD,MAAM,aAAa,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEzD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,iBAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;AACpC,CAAC,CAAC;AAtBW,QAAA,yBAAyB,6BAsBpC"}

package/dist/utils/private/diffie-hellman/diffie-hellman-key-wrap.d.ts

@@ -1,4 +1,4 @@
 import { CreateCekOptions, CreateCekResult, DecryptCekOptions, DecryptCekResult } from "../../../types/private";
-export declare const getDiffieHellmanKeyWrapEncryptionKey: ({ encryption, kryptos, }: CreateCekOptions) => CreateCekResult;
-export declare const getDiffieHellmanKeyWrapDecryptionKey: ({ hkdfSalt, kryptos, publicEncryptionJwk, publicEncryptionIv, publicEncryptionKey, publicEncryptionTag, }: DecryptCekOptions) => DecryptCekResult;
+export declare const getDiffieHellmanKeyWrapEncryptionKey: ({ apu, apv, encryption, kryptos, }: CreateCekOptions) => CreateCekResult;
+export declare const getDiffieHellmanKeyWrapDecryptionKey: ({ apu, apv, kryptos, publicEncryptionJwk, publicEncryptionIv, publicEncryptionKey, publicEncryptionTag, }: DecryptCekOptions) => DecryptCekResult;
 //# sourceMappingURL=diffie-hellman-key-wrap.d.ts.map

package/dist/utils/private/diffie-hellman/diffie-hellman-key-wrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diffie-hellman-key-wrap.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman-key-wrap.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAMhC,eAAO,MAAM,oCAAoC,GAAI,0BAGlD,gBAAgB,KAAG,eAyBrB,CAAC;AAEF,eAAO,MAAM,oCAAoC,GAAI,2GAOlD,iBAAiB,KAAG,gBAoBtB,CAAC"}
+{"version":3,"file":"diffie-hellman-key-wrap.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman-key-wrap.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAMhC,eAAO,MAAM,oCAAoC,GAAI,oCAKlD,gBAAgB,KAAG,eA2BrB,CAAC;AAEF,eAAO,MAAM,oCAAoC,GAAI,2GAQlD,iBAAiB,KAAG,gBAsBtB,CAAC"}

package/dist/utils/private/diffie-hellman/diffie-hellman-key-wrap.js

@@ -7,13 +7,16 @@ const calculate_1 = require("../calculate");
 const key_derivation_1 = require("../key-derivation");
 const key_wrap_1 = require("../key-wrap");
 const shared_secret_1 = require("./shared-secret");
-const getDiffieHellmanKeyWrapEncryptionKey = ({ encryption, kryptos, }) => {
+const getDiffieHellmanKeyWrapEncryptionKey = ({ apu, apv, encryption, kryptos, }) => {
     const { publicEncryptionJwk, sharedSecret } = (0, shared_secret_1.generateSharedSecret)(kryptos);
     const cekSize = (0, calculate_1.calculateContentEncryptionKeySize)(encryption);
     const contentEncryptionKey = (0, crypto_1.randomBytes)(cekSize);
-    const { derivedKey, hkdfSalt } = (0, key_derivation_1.hkdf)({
-        derivationKey: sharedSecret,
+    const { derivedKey } = (0, key_derivation_1.concatKdf)({
+        algorithm: kryptos.algorithm,
+        apu,
+        apv,
         keyLength: (0, calculate_1.calculateKeyWrapSize)(kryptos.algorithm),
+        sharedSecret,
     });
     const { publicEncryptionKey, publicEncryptionIv, publicEncryptionTag } = (0, key_wrap_1.keyWrap)({
         contentEncryptionKey,
@@ -22,7 +25,6 @@ const getDiffieHellmanKeyWrapEncryptionKey = ({ encryption, kryptos, }) => {
     });
     return {
         contentEncryptionKey,
-        hkdfSalt,
         publicEncryptionJwk,
         publicEncryptionKey,
         publicEncryptionIv,
@@ -30,15 +32,17 @@ const getDiffieHellmanKeyWrapEncryptionKey = ({ encryption, kryptos, }) => {
     };
 };
 exports.getDiffieHellmanKeyWrapEncryptionKey = getDiffieHellmanKeyWrapEncryptionKey;
-const getDiffieHellmanKeyWrapDecryptionKey = ({ hkdfSalt, kryptos, publicEncryptionJwk, publicEncryptionIv, publicEncryptionKey, publicEncryptionTag, }) => {
+const getDiffieHellmanKeyWrapDecryptionKey = ({ apu, apv, kryptos, publicEncryptionJwk, publicEncryptionIv, publicEncryptionKey, publicEncryptionTag, }) => {
     if (!publicEncryptionKey) {
         throw new errors_1.AesError("Missing publicEncryptionKey");
     }
     const sharedSecret = (0, shared_secret_1.calculateSharedSecret)({ kryptos, publicEncryptionJwk });
-    const { derivedKey } = (0, key_derivation_1.hkdf)({
-        derivationKey: sharedSecret,
-        hkdfSalt,
+    const { derivedKey } = (0, key_derivation_1.concatKdf)({
+        algorithm: kryptos.algorithm,
+        apu,
+        apv,
         keyLength: (0, calculate_1.calculateKeyWrapSize)(kryptos.algorithm),
+        sharedSecret,
     });
     return (0, key_wrap_1.keyUnwrap)({
         keyEncryptionKey: derivedKey,

package/dist/utils/private/diffie-hellman/diffie-hellman-key-wrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"diffie-hellman-key-wrap.js","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman-key-wrap.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AACrC,4CAA2C;AAO3C,4CAAuF;AACvF,sDAAyC;AACzC,0CAAiD;AACjD,mDAA8E;AAEvE,MAAM,oCAAoC,GAAG,CAAC,EACnD,UAAU,EACV,OAAO,GACU,EAAmB,EAAE;IACtC,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,IAAA,oCAAoB,EAAC,OAAO,CAAC,CAAC;IAE5E,MAAM,OAAO,GAAG,IAAA,6CAAiC,EAAC,UAAU,CAAC,CAAC;IAC9D,MAAM,oBAAoB,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAI,EAAC;QACpC,aAAa,EAAE,YAAY;QAC3B,SAAS,EAAE,IAAA,gCAAoB,EAAC,OAAO,CAAC,SAAS,CAAC;KACnD,CAAC,CAAC;IAEH,MAAM,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,GAAG,IAAA,kBAAO,EAAC;QAC/E,oBAAoB;QACpB,OAAO;QACP,gBAAgB,EAAE,UAAU;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB;QACpB,QAAQ;QACR,mBAAmB;QACnB,mBAAmB;QACnB,kBAAkB;QAClB,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,oCAAoC,wCA4B/C;AAEK,MAAM,oCAAoC,GAAG,CAAC,EACnD,QAAQ,EACR,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,GACD,EAAoB,EAAE;IACxC,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAQ,CAAC,6BAA6B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,qCAAqB,EAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE7E,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,qBAAI,EAAC;QAC1B,aAAa,EAAE,YAAY;QAC3B,QAAQ;QACR,SAAS,EAAE,IAAA,gCAAoB,EAAC,OAAO,CAAC,SAAS,CAAC;KACnD,CAAC,CAAC;IAEH,OAAO,IAAA,oBAAS,EAAC;QACf,gBAAgB,EAAE,UAAU;QAC5B,OAAO;QACP,kBAAkB;QAClB,mBAAmB;QACnB,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC,CAAC;AA3BW,QAAA,oCAAoC,wCA2B/C"}
+{"version":3,"file":"diffie-hellman-key-wrap.js","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman-key-wrap.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AACrC,4CAA2C;AAO3C,4CAAuF;AACvF,sDAA8C;AAC9C,0CAAiD;AACjD,mDAA8E;AAEvE,MAAM,oCAAoC,GAAG,CAAC,EACnD,GAAG,EACH,GAAG,EACH,UAAU,EACV,OAAO,GACU,EAAmB,EAAE;IACtC,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,IAAA,oCAAoB,EAAC,OAAO,CAAC,CAAC;IAE5E,MAAM,OAAO,GAAG,IAAA,6CAAiC,EAAC,UAAU,CAAC,CAAC;IAC9D,MAAM,oBAAoB,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAS,EAAC;QAC/B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,GAAG;QACH,GAAG;QACH,SAAS,EAAE,IAAA,gCAAoB,EAAC,OAAO,CAAC,SAAS,CAAC;QAClD,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,GAAG,IAAA,kBAAO,EAAC;QAC/E,oBAAoB;QACpB,OAAO;QACP,gBAAgB,EAAE,UAAU;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB;QACpB,mBAAmB;QACnB,mBAAmB;QACnB,kBAAkB;QAClB,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,oCAAoC,wCAgC/C;AAEK,MAAM,oCAAoC,GAAG,CAAC,EACnD,GAAG,EACH,GAAG,EACH,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,GACD,EAAoB,EAAE;IACxC,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAQ,CAAC,6BAA6B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,qCAAqB,EAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE7E,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAS,EAAC;QAC/B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,GAAG;QACH,GAAG;QACH,SAAS,EAAE,IAAA,gCAAoB,EAAC,OAAO,CAAC,SAAS,CAAC;QAClD,YAAY;KACb,CAAC,CAAC;IAEH,OAAO,IAAA,oBAAS,EAAC;QACf,gBAAgB,EAAE,UAAU;QAC5B,OAAO;QACP,kBAAkB;QAClB,mBAAmB;QACnB,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC,CAAC;AA9BW,QAAA,oCAAoC,wCA8B/C"}

package/dist/utils/private/diffie-hellman/diffie-hellman.d.ts

@@ -1,4 +1,4 @@
 import { CreateCekOptions, CreateCekResult, DecryptCekOptions, DecryptCekResult } from "../../../types/private";
-export declare const getDiffieHellmanEncryptionKey: ({ encryption, kryptos, }: CreateCekOptions) => CreateCekResult;
-export declare const getDiffieHellmanDecryptionKey: ({ encryption, hkdfSalt, kryptos, publicEncryptionJwk, }: DecryptCekOptions) => DecryptCekResult;
+export declare const getDiffieHellmanEncryptionKey: ({ apu, apv, encryption, kryptos, }: CreateCekOptions) => CreateCekResult;
+export declare const getDiffieHellmanDecryptionKey: ({ apu, apv, encryption, kryptos, publicEncryptionJwk, }: DecryptCekOptions) => DecryptCekResult;
 //# sourceMappingURL=diffie-hellman.d.ts.map

package/dist/utils/private/diffie-hellman/diffie-hellman.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diffie-hellman.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,6BAA6B,GAAI,0BAG3C,gBAAgB,KAAG,eAcrB,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,yDAK3C,iBAAiB,KAAG,gBAkBtB,CAAC"}
+{"version":3,"file":"diffie-hellman.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,6BAA6B,GAAI,oCAK3C,gBAAgB,KAAG,eAgBrB,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,yDAM3C,iBAAiB,KAAG,gBAoBtB,CAAC"}

package/dist/utils/private/diffie-hellman/diffie-hellman.js

@@ -6,21 +6,23 @@ const errors_1 = require("../../../errors");
 const calculate_1 = require("../calculate");
 const key_derivation_1 = require("../key-derivation");
 const shared_secret_1 = require("./shared-secret");
-const getDiffieHellmanEncryptionKey = ({ encryption, kryptos, }) => {
+const getDiffieHellmanEncryptionKey = ({ apu, apv, encryption, kryptos, }) => {
     const { publicEncryptionJwk, sharedSecret } = (0, shared_secret_1.generateSharedSecret)(kryptos);
     const keyLength = (0, calculate_1.calculateContentEncryptionKeySize)(encryption);
-    const { derivedKey, hkdfSalt } = (0, key_derivation_1.hkdf)({
-        derivationKey: sharedSecret,
+    const { derivedKey } = (0, key_derivation_1.concatKdf)({
+        algorithm: encryption,
+        apu,
+        apv,
         keyLength,
+        sharedSecret,
     });
     return {
         contentEncryptionKey: derivedKey,
-        hkdfSalt,
         publicEncryptionJwk,
     };
 };
 exports.getDiffieHellmanEncryptionKey = getDiffieHellmanEncryptionKey;
-const getDiffieHellmanDecryptionKey = ({ encryption, hkdfSalt, kryptos, publicEncryptionJwk, }) => {
+const getDiffieHellmanDecryptionKey = ({ apu, apv, encryption, kryptos, publicEncryptionJwk, }) => {
     if (!kryptos_1.KryptosKit.isEc(kryptos) && !kryptos_1.KryptosKit.isOkp(kryptos)) {
         throw new errors_1.AesError("Invalid kryptos type");
     }
@@ -29,10 +31,12 @@ const getDiffieHellmanDecryptionKey = ({ encryption, hkdfSalt, kryptos, publicEn
     }
     const sharedSecret = (0, shared_secret_1.calculateSharedSecret)({ kryptos, publicEncryptionJwk });
     const keyLength = (0, calculate_1.calculateContentEncryptionKeySize)(encryption);
-    const { derivedKey } = (0, key_derivation_1.hkdf)({
-        derivationKey: sharedSecret,
-        hkdfSalt,
+    const { derivedKey } = (0, key_derivation_1.concatKdf)({
+        algorithm: encryption,
+        apu,
+        apv,
         keyLength,
+        sharedSecret,
     });
     return { contentEncryptionKey: derivedKey };
 };

package/dist/utils/private/diffie-hellman/diffie-hellman.js.map

@@ -1 +1 @@
-{"version":3,"file":"diffie-hellman.js","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,4CAA2C;AAO3C,4CAAiE;AACjE,sDAAyC;AACzC,mDAA8E;AAEvE,MAAM,6BAA6B,GAAG,CAAC,EAC5C,UAAU,EACV,OAAO,GACU,EAAmB,EAAE;IACtC,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,IAAA,oCAAoB,EAAC,OAAO,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,IAAA,6CAAiC,EAAC,UAAU,CAAC,CAAC;IAEhE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAA,qBAAI,EAAC;QACpC,aAAa,EAAE,YAAY;QAC3B,SAAS;KACV,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB,EAAE,UAAU;QAChC,QAAQ;QACR,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,6BAA6B,iCAiBxC;AAEK,MAAM,6BAA6B,GAAG,CAAC,EAC5C,UAAU,EACV,QAAQ,EACR,OAAO,EACP,mBAAmB,GACD,EAAoB,EAAE;IACxC,IAAI,CAAC,oBAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAQ,CAAC,6BAA6B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,qCAAqB,EAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,IAAA,6CAAiC,EAAC,UAAU,CAAC,CAAC;IAEhE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,qBAAI,EAAC;QAC1B,aAAa,EAAE,YAAY;QAC3B,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAC;AAC9C,CAAC,CAAC;AAvBW,QAAA,6BAA6B,iCAuBxC"}
+{"version":3,"file":"diffie-hellman.js","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/diffie-hellman.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,4CAA2C;AAO3C,4CAAiE;AACjE,sDAA8C;AAC9C,mDAA8E;AAEvE,MAAM,6BAA6B,GAAG,CAAC,EAC5C,GAAG,EACH,GAAG,EACH,UAAU,EACV,OAAO,GACU,EAAmB,EAAE;IACtC,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,IAAA,oCAAoB,EAAC,OAAO,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,IAAA,6CAAiC,EAAC,UAAU,CAAC,CAAC;IAEhE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAS,EAAC;QAC/B,SAAS,EAAE,UAAU;QACrB,GAAG;QACH,GAAG;QACH,SAAS;QACT,YAAY;KACb,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB,EAAE,UAAU;QAChC,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,6BAA6B,iCAqBxC;AAEK,MAAM,6BAA6B,GAAG,CAAC,EAC5C,GAAG,EACH,GAAG,EACH,UAAU,EACV,OAAO,EACP,mBAAmB,GACD,EAAoB,EAAE;IACxC,IAAI,CAAC,oBAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,iBAAQ,CAAC,sBAAsB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAQ,CAAC,6BAA6B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,qCAAqB,EAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,IAAA,6CAAiC,EAAC,UAAU,CAAC,CAAC;IAEhE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAS,EAAC;QAC/B,SAAS,EAAE,UAAU;QACrB,GAAG;QACH,GAAG;QACH,SAAS;QACT,YAAY;KACb,CAAC,CAAC;IAEH,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAC;AAC9C,CAAC,CAAC;AA1BW,QAAA,6BAA6B,iCA0BxC"}

package/dist/utils/private/diffie-hellman/shared-secret.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared-secret.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/shared-secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,KAAK,cAAc,GAAG;IACpB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,4BAA4B,GAAG,IAAI,CACtC,iBAAiB,EACjB,SAAS,GAAG,qBAAqB,CAClC,CAAC;AAoBF,eAAO,MAAM,oBAAoB,GAAI,SAAS,QAAQ,KAAG,cA+BxD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,mCAGnC,4BAA4B,KAAG,MA4BjC,CAAC"}
+{"version":3,"file":"shared-secret.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/shared-secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,KAAK,cAAc,GAAG;IACpB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,4BAA4B,GAAG,IAAI,CACtC,iBAAiB,EACjB,SAAS,GAAG,qBAAqB,CAClC,CAAC;AAoBF,eAAO,MAAM,oBAAoB,GAAI,SAAS,QAAQ,KAAG,cA+BxD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,mCAGnC,4BAA4B,KAAG,MAgCjC,CAAC"}

package/dist/utils/private/diffie-hellman/shared-secret.js

@@ -52,7 +52,11 @@ const calculateSharedSecret = ({ kryptos, publicEncryptionJwk, }) => {
     if (!publicEncryptionJwk) {
         throw new errors_1.AesError("Missing publicEncryptionJwk");
     }
-    const pek = kryptos_1.KryptosKit.from.jwk({ alg: "ECDH-ES", use: "enc", ...publicEncryptionJwk });
+    const pek = kryptos_1.KryptosKit.from.jwk({
+        alg: kryptos.algorithm,
+        use: "enc",
+        ...publicEncryptionJwk,
+    });
     const der = kryptos.export("der");
     const receiver = pek.export("der");
     if (!der.privateKey) {

package/dist/utils/private/diffie-hellman/shared-secret.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared-secret.js","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/shared-secret.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared-secret.js","sourceRoot":"","sources":["../../../../src/utils/private/diffie-hellman/shared-secret.ts"],"names":[],"mappings":"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"}

package/dist/utils/private/encoded-aes.d.ts

@@ -1,4 +1,4 @@
-import { AesEncryptionRecord } from "../../types";
+import { AesEncryptionRecord, ParsedAesDecryptionRecord } from "../../types";
 export declare const createEncodedAesString: (data: AesEncryptionRecord) => string;
-export declare const parseEncodedAesString: (encoded: string) => AesEncryptionRecord;
+export declare const parseEncodedAesString: (encoded: string) => ParsedAesDecryptionRecord;
 //# sourceMappingURL=encoded-aes.d.ts.map

package/dist/utils/private/encoded-aes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoded-aes.d.ts","sourceRoot":"","sources":["../../../src/utils/private/encoded-aes.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,mBAAmB,EAAuB,MAAM,aAAa,CAAC;AAEvF,eAAO,MAAM,sBAAsB,GAAI,MAAM,mBAAmB,KAAG,MAmGlE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM,KAAG,mBAuGvD,CAAC"}
+{"version":3,"file":"encoded-aes.d.ts","sourceRoot":"","sources":["../../../src/utils/private/encoded-aes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AA2C7E,eAAO,MAAM,sBAAsB,GAAI,MAAM,mBAAmB,KAAG,MAwClE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM,KAAG,yBA+EvD,CAAC"}