@lindorm/aes 0.2.0 → 0.3.1

package/dist/utils/private/oct/get-oct-pbkdf-key-wrap-keys.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._getOctPbkdfKeyWrapDecryptionKey = exports._getOctPbkdfKeyWrapEncryptionKey = void 0;
+exports.getOctPbkdfKeyWrapDecryptionKey = exports.getOctPbkdfKeyWrapEncryptionKey = void 0;
 const kryptos_1 = require("@lindorm/kryptos");
 const crypto_1 = require("crypto");
 const errors_1 = require("../../../errors");
@@ -8,20 +8,20 @@ const calculate_content_encryption_key_size_1 = require("../calculate/calculate-
 const calculate_key_wrap_size_1 = require("../calculate/calculate-key-wrap-size");
 const calculate_pbkdf_hash_1 = require("../calculate/calculate-pbkdf-hash");
 const pbkdf_1 = require("../key-derivation/pbkdf");
-const key_wrap_1 = require("../key-wrap/key-wrap");
-const _getOctPbkdfKeyWrapEncryptionKey = ({ encryption, kryptos, }) => {
+const ecb_key_wrap_1 = require("../key-wrap/ecb-key-wrap");
+const getOctPbkdfKeyWrapEncryptionKey = ({ encryption, kryptos, }) => {
     if (!kryptos_1.Kryptos.isOct(kryptos)) {
         throw new errors_1.AesError("Invalid Kryptos", { debug: { kryptos: kryptos.toJSON() } });
     }
     const der = kryptos.export("der");
-    const cekSize = (0, calculate_content_encryption_key_size_1._calculateContentEncryptionKeySize)(encryption);
+    const cekSize = (0, calculate_content_encryption_key_size_1.calculateContentEncryptionKeySize)(encryption);
     const contentEncryptionKey = (0, crypto_1.randomBytes)(cekSize);
-    const { derivedKey, pbkdfIterations, pbkdfSalt } = (0, pbkdf_1._pbkdf)({
+    const { derivedKey, pbkdfIterations, pbkdfSalt } = (0, pbkdf_1.pbkdf)({
         derivationKey: der.privateKey,
-        keyLength: (0, calculate_key_wrap_size_1._calculateKeyWrapSize)(kryptos.algorithm),
-        algorithm: (0, calculate_pbkdf_hash_1._calculatePbkdfAlgorithm)(kryptos),
+        keyLength: (0, calculate_key_wrap_size_1.calculateKeyWrapSize)(kryptos.algorithm),
+        algorithm: (0, calculate_pbkdf_hash_1.calculatePbkdfAlgorithm)(kryptos),
     });
-    const publicEncryptionKey = (0, key_wrap_1._aesKeyWrap)({
+    const { publicEncryptionKey } = (0, ecb_key_wrap_1.ecbKeyWrap)({
         contentEncryptionKey,
         kryptos,
         keyEncryptionKey: derivedKey,
@@ -33,8 +33,8 @@ const _getOctPbkdfKeyWrapEncryptionKey = ({ encryption, kryptos, }) => {
         publicEncryptionKey,
     };
 };
-exports._getOctPbkdfKeyWrapEncryptionKey = _getOctPbkdfKeyWrapEncryptionKey;
-const _getOctPbkdfKeyWrapDecryptionKey = ({ kryptos, pbkdfIterations, pbkdfSalt, publicEncryptionKey, }) => {
+exports.getOctPbkdfKeyWrapEncryptionKey = getOctPbkdfKeyWrapEncryptionKey;
+const getOctPbkdfKeyWrapDecryptionKey = ({ kryptos, pbkdfIterations, pbkdfSalt, publicEncryptionKey, }) => {
     if (!kryptos_1.Kryptos.isOct(kryptos)) {
         throw new errors_1.AesError("Invalid Kryptos", { debug: { kryptos: kryptos.toJSON() } });
     }
@@ -42,19 +42,18 @@ const _getOctPbkdfKeyWrapDecryptionKey = ({ kryptos, pbkdfIterations, pbkdfSalt,
         throw new errors_1.AesError("Missing publicEncryptionKey");
     }
     const der = kryptos.export("der");
-    const { derivedKey } = (0, pbkdf_1._pbkdf)({
+    const { derivedKey } = (0, pbkdf_1.pbkdf)({
         derivationKey: der.privateKey,
-        keyLength: (0, calculate_key_wrap_size_1._calculateKeyWrapSize)(kryptos.algorithm),
-        algorithm: (0, calculate_pbkdf_hash_1._calculatePbkdfAlgorithm)(kryptos),
+        keyLength: (0, calculate_key_wrap_size_1.calculateKeyWrapSize)(kryptos.algorithm),
+        algorithm: (0, calculate_pbkdf_hash_1.calculatePbkdfAlgorithm)(kryptos),
         pbkdfIterations,
         pbkdfSalt,
     });
-    const unwrappedKey = (0, key_wrap_1._aesKeyUnwrap)({
+    return (0, ecb_key_wrap_1.ecbKeyUnwrap)({
         keyEncryptionKey: derivedKey,
         kryptos,
-        wrappedKey: publicEncryptionKey,
+        publicEncryptionKey,
     });
-    return { contentEncryptionKey: unwrappedKey };
 };
-exports._getOctPbkdfKeyWrapDecryptionKey = _getOctPbkdfKeyWrapDecryptionKey;
+exports.getOctPbkdfKeyWrapDecryptionKey = getOctPbkdfKeyWrapDecryptionKey;
 //# sourceMappingURL=get-oct-pbkdf-key-wrap-keys.js.map

package/dist/utils/private/oct/get-oct-pbkdf-key-wrap-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-oct-pbkdf-key-wrap-keys.js","sourceRoot":"","sources":["../../../../src/utils/private/oct/get-oct-pbkdf-key-wrap-keys.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,mCAAqC;AACrC,4CAA2C;AAO3C,8GAAwG;AACxG,kFAA6E;AAC7E,4EAA6E;AAC7E,mDAAiD;AACjD,mDAAkE;AAE3D,MAAM,gCAAgC,GAAG,CAAC,EAC/C,UAAU,EACV,OAAO,GACU,EAAmB,EAAE;IACtC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,IAAA,0EAAkC,EAAC,UAAU,CAAC,CAAC;IAC/D,MAAM,oBAAoB,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,IAAA,cAAM,EAAC;QACxD,aAAa,EAAE,GAAG,CAAC,UAAU;QAC7B,SAAS,EAAE,IAAA,+CAAqB,EAAC,OAAO,CAAC,SAAS,CAAC;QACnD,SAAS,EAAE,IAAA,+CAAwB,EAAC,OAAO,CAAC;KAC7C,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,IAAA,sBAAW,EAAC;QACtC,oBAAoB;QACpB,OAAO;QACP,gBAAgB,EAAE,UAAU;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB;QACpB,eAAe;QACf,SAAS;QACT,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,gCAAgC,oCA+B3C;AAEK,MAAM,gCAAgC,GAAG,CAAC,EAC/C,OAAO,EACP,eAAe,EACf,SAAS,EACT,mBAAmB,GACD,EAAoB,EAAE;IACxC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAQ,CAAC,6BAA6B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAM,EAAC;QAC5B,aAAa,EAAE,GAAG,CAAC,UAAU;QAC7B,SAAS,EAAE,IAAA,+CAAqB,EAAC,OAAO,CAAC,SAAS,CAAC;QACnD,SAAS,EAAE,IAAA,+CAAwB,EAAC,OAAO,CAAC;QAC5C,eAAe;QACf,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,wBAAa,EAAC;QACjC,gBAAgB,EAAE,UAAU;QAC5B,OAAO;QACP,UAAU,EAAE,mBAAmB;KAChC,CAAC,CAAC;IAEH,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AAChD,CAAC,CAAC;AA9BW,QAAA,gCAAgC,oCA8B3C"}
+{"version":3,"file":"get-oct-pbkdf-key-wrap-keys.js","sourceRoot":"","sources":["../../../../src/utils/private/oct/get-oct-pbkdf-key-wrap-keys.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,mCAAqC;AACrC,4CAA2C;AAO3C,8GAAuG;AACvG,kFAA4E;AAC5E,4EAA4E;AAC5E,mDAAgD;AAChD,2DAAoE;AAE7D,MAAM,+BAA+B,GAAG,CAAC,EAC9C,UAAU,EACV,OAAO,GACU,EAAmB,EAAE;IACtC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,IAAA,yEAAiC,EAAC,UAAU,CAAC,CAAC;IAC9D,MAAM,oBAAoB,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,IAAA,aAAK,EAAC;QACvD,aAAa,EAAE,GAAG,CAAC,UAAU;QAC7B,SAAS,EAAE,IAAA,8CAAoB,EAAC,OAAO,CAAC,SAAS,CAAC;QAClD,SAAS,EAAE,IAAA,8CAAuB,EAAC,OAAO,CAAC;KAC5C,CAAC,CAAC;IAEH,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,yBAAU,EAAC;QACzC,oBAAoB;QACpB,OAAO;QACP,gBAAgB,EAAE,UAAU;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB;QACpB,eAAe;QACf,SAAS;QACT,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,+BAA+B,mCA+B1C;AAEK,MAAM,+BAA+B,GAAG,CAAC,EAC9C,OAAO,EACP,eAAe,EACf,SAAS,EACT,mBAAmB,GACD,EAAoB,EAAE;IACxC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAQ,CAAC,6BAA6B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,aAAK,EAAC;QAC3B,aAAa,EAAE,GAAG,CAAC,UAAU;QAC7B,SAAS,EAAE,IAAA,8CAAoB,EAAC,OAAO,CAAC,SAAS,CAAC;QAClD,SAAS,EAAE,IAAA,8CAAuB,EAAC,OAAO,CAAC;QAC3C,eAAe;QACf,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,IAAA,2BAAY,EAAC;QAClB,gBAAgB,EAAE,UAAU;QAC5B,OAAO;QACP,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC,CAAC;AA5BW,QAAA,+BAA+B,mCA4B1C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lindorm/aes",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "license": "AGPL-3.0-or-later",
   "author": "Jonn Nilsson",
   "repository": {
@@ -26,12 +26,12 @@
     "update": "ncu -u"
   },
   "dependencies": {
-    "@lindorm/errors": "^0.1.5",
-    "@lindorm/is": "^0.1.5",
-    "@lindorm/kryptos": "^0.3.0"
+    "@lindorm/errors": "^0.1.6",
+    "@lindorm/is": "^0.1.6",
+    "@lindorm/kryptos": "^0.3.2"
   },
   "devDependencies": {
-    "@lindorm/types": "^0.1.4"
+    "@lindorm/types": "^0.2.0"
   },
-  "gitHead": "677a485cb48b37f891f25a46f417b033cbfec9e2"
+  "gitHead": "bad333c98cd6f093412f0a7116c2f79e486dc996"
 }

package/dist/utils/private/oct/get-oct-key-wrap-keys.d.ts

@@ -1,4 +0,0 @@
-import { CreateCekOptions, CreateCekResult, DecryptCekOptions, DecryptCekResult } from "../../../types/private";
-export declare const _getOctKeyWrapEncryptionKey: ({ encryption, kryptos, }: CreateCekOptions) => CreateCekResult;
-export declare const _getOctKeyWrapDecryptionKey: ({ hkdfSalt, kryptos, publicEncryptionKey, }: DecryptCekOptions) => DecryptCekResult;
-//# sourceMappingURL=get-oct-key-wrap-keys.d.ts.map

package/dist/utils/private/oct/get-oct-key-wrap-keys.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-oct-key-wrap-keys.d.ts","sourceRoot":"","sources":["../../../../src/utils/private/oct/get-oct-key-wrap-keys.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAMhC,eAAO,MAAM,2BAA2B,6BAGrC,gBAAgB,KAAG,eA0BrB,CAAC;AAEF,eAAO,MAAM,2BAA2B,gDAIrC,iBAAiB,KAAG,gBAuBtB,CAAC"}

package/dist/utils/private/oct/get-oct-key-wrap-keys.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-oct-key-wrap-keys.js","sourceRoot":"","sources":["../../../../src/utils/private/oct/get-oct-key-wrap-keys.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,mCAAqC;AACrC,4CAA2C;AAO3C,8GAAwG;AACxG,kFAA6E;AAC7E,iDAA+C;AAC/C,mDAAkE;AAE3D,MAAM,2BAA2B,GAAG,CAAC,EAC1C,UAAU,EACV,OAAO,GACU,EAAmB,EAAE;IACtC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,IAAA,0EAAkC,EAAC,UAAU,CAAC,CAAC;IAC/D,MAAM,oBAAoB,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAA,YAAK,EAAC;QACrC,aAAa,EAAE,GAAG,CAAC,UAAU;QAC7B,SAAS,EAAE,IAAA,+CAAqB,EAAC,OAAO,CAAC,SAAS,CAAC;KACpD,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,IAAA,sBAAW,EAAC;QACtC,oBAAoB;QACpB,OAAO;QACP,gBAAgB,EAAE,UAAU;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB;QACpB,QAAQ;QACR,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,2BAA2B,+BA6BtC;AAEK,MAAM,2BAA2B,GAAG,CAAC,EAC1C,QAAQ,EACR,OAAO,EACP,mBAAmB,GACD,EAAoB,EAAE;IACxC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAQ,CAAC,6BAA6B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,YAAK,EAAC;QAC3B,aAAa,EAAE,GAAG,CAAC,UAAU;QAC7B,QAAQ;QACR,SAAS,EAAE,IAAA,+CAAqB,EAAC,OAAO,CAAC,SAAS,CAAC;KACpD,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,wBAAa,EAAC;QACjC,gBAAgB,EAAE,UAAU;QAC5B,OAAO;QACP,UAAU,EAAE,mBAAmB;KAChC,CAAC,CAAC;IAEH,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AAChD,CAAC,CAAC;AA3BW,QAAA,2BAA2B,+BA2BtC"}