@nmshd/crypto 1.0.8 → 2.0.1

package/dist/buildInformation.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildInformation = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 exports.buildInformation = {
-    version: "1.0.8",
-    build: "10",
-    date: "2022-01-24T16:59:04+00:00",
-    commit: "bc03eafc9935d98a4be1b59707d5162852e53a48",
-    dependencies: {"libsodium-wrappers-sumo":"0.7.9","uuid":"8.3.2"},
+    version: "2.0.1",
+    build: "13",
+    date: "2022-04-21T14:23:06+00:00",
+    commit: "dcef03f22ff721191e22ded7e50b1560f88387ee",
+    dependencies: {"libsodium-wrappers-sumo":"0.7.10","uuid":"8.3.2"},
     libraries: {
         serval: ts_serval_1.buildInformation
     }

package/dist/encryption/CryptoCipher.d.ts

@@ -1,6 +1,6 @@
 import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoEncryptionAlgorithm } from "./CryptoEncryption";
 export interface ICryptoCipherSerialized extends ISerialized {
     alg: number;
@@ -14,18 +14,17 @@ export interface ICryptoCipher extends ISerializable {
     counter?: number;
     nonce?: ICoreBuffer;
 }
-export declare class CryptoCipher extends CryptoSerializableAsync implements ICryptoCipher, IClearable {
+export declare class CryptoCipher extends CryptoSerializable implements ICryptoCipher, IClearable {
     static MIN_CIPHER_BYTES: number;
     static MAX_CIPHER_BYTES: number;
-    readonly algorithm: CryptoEncryptionAlgorithm;
-    readonly cipher: CoreBuffer;
-    readonly counter?: number;
-    readonly nonce?: CoreBuffer;
-    constructor(cipher: CoreBuffer, algorithm: CryptoEncryptionAlgorithm, nonce?: CoreBuffer, counter?: number);
+    algorithm: CryptoEncryptionAlgorithm;
+    cipher: CoreBuffer;
+    counter?: number;
+    nonce?: CoreBuffer;
     toJSON(verbose?: boolean): ICryptoCipherSerialized;
     clear(): void;
-    static from(value: CryptoCipher | ICryptoCipher): Promise<CryptoCipher>;
-    static fromJSON(value: ICryptoCipherSerialized): Promise<CryptoCipher>;
-    static fromBase64(value: string): Promise<CryptoCipher>;
-    static deserialize(value: string): Promise<CryptoCipher>;
+    static from(value: CryptoCipher | ICryptoCipher): CryptoCipher;
+    protected static preFrom(value: any): any;
+    static fromJSON(value: ICryptoCipherSerialized): CryptoCipher;
+    static fromBase64(value: string): CryptoCipher;
 }

package/dist/encryption/CryptoCipher.js

@@ -15,84 +15,87 @@ const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoError_1 = require("../CryptoError");
 const CryptoErrorCode_1 = require("../CryptoErrorCode");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoValidation_1 = require("../CryptoValidation");
-let CryptoCipher = CryptoCipher_1 = class CryptoCipher extends CryptoSerializableAsync_1.CryptoSerializableAsync {
-    constructor(cipher, algorithm, nonce, counter) {
-        if (!nonce && typeof counter === "undefined") {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionNoNonceNorCounter, "No nonce nor counter property set.");
-        }
-        if (nonce && typeof counter !== "undefined") {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionNonceAndCounter, "Nonce and counter properties are set.");
-        }
-        CryptoValidation_1.CryptoValidation.checkBuffer(cipher, CryptoCipher_1.MIN_CIPHER_BYTES, CryptoCipher_1.MAX_CIPHER_BYTES, "cipher");
-        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(algorithm);
-        if (typeof counter !== "undefined") {
-            CryptoValidation_1.CryptoValidation.checkCounter(counter);
-        }
-        if (typeof nonce !== "undefined") {
-            CryptoValidation_1.CryptoValidation.checkNonceForAlgorithm(nonce, algorithm);
-        }
-        super();
-        this.cipher = cipher;
-        this.nonce = nonce;
-        this.counter = counter;
-        this.algorithm = algorithm;
-    }
+let CryptoCipher = CryptoCipher_1 = class CryptoCipher extends CryptoSerializable_1.CryptoSerializable {
     toJSON(verbose = true) {
-        const obj = {
+        return {
             cph: this.cipher.toBase64URL(),
-            alg: this.algorithm
+            alg: this.algorithm,
+            nnc: this.nonce ? this.nonce.toBase64URL() : undefined,
+            cnt: this.counter,
+            "@type": verbose ? "CryptoCipher" : undefined
         };
-        if (this.nonce) {
-            obj.nnc = this.nonce.toBase64URL();
-        }
-        if (typeof this.counter !== "undefined") {
-            obj.cnt = this.counter;
-        }
-        if (verbose) {
-            obj["@type"] = "CryptoCipher";
-        }
-        return obj;
     }
     clear() {
+        var _a;
         this.cipher.clear();
-        if (this.nonce)
-            this.nonce.clear();
+        (_a = this.nonce) === null || _a === void 0 ? void 0 : _a.clear();
     }
     static from(value) {
-        return Promise.resolve(new CryptoCipher_1(CoreBuffer_1.CoreBuffer.from(value.cipher), value.algorithm, CoreBuffer_1.CoreBuffer.from(value.nonce), value.counter));
+        return this.fromAny(value);
     }
-    static fromJSON(value) {
-        CryptoValidation_1.CryptoValidation.checkObject(value);
-        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.alg);
-        let nonceBuffer;
-        let counter;
-        if (typeof value.nnc !== "undefined") {
-            CryptoValidation_1.CryptoValidation.checkSerializedBuffer(value.nnc, 12, 32, "nonce");
-            nonceBuffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.nnc);
+    static preFrom(value) {
+        if (value.cph) {
+            value = {
+                cipher: value.cph,
+                algorithm: value.alg,
+                nonce: value.nnc,
+                counter: value.cnt
+            };
+        }
+        if (!value.nonce && typeof value.counter === "undefined") {
+            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionNoNonceNorCounter, "No nonce nor counter property set.");
+        }
+        if (value.nonce && typeof value.counter !== "undefined") {
+            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionNonceAndCounter, "Nonce and counter properties are set.");
         }
-        if (typeof value.cnt !== "undefined") {
-            CryptoValidation_1.CryptoValidation.checkCounter(value.cnt);
-            counter = value.cnt;
+        if (typeof value.cipher === "string") {
+            CryptoValidation_1.CryptoValidation.checkSerializedBuffer(value.cipher, this.MIN_CIPHER_BYTES, this.MAX_CIPHER_BYTES, "cipher");
         }
-        CryptoValidation_1.CryptoValidation.checkSerializedBuffer(value.cph, this.MIN_CIPHER_BYTES, this.MAX_CIPHER_BYTES, "cipher");
-        const cipherBuffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.cph);
-        return Promise.resolve(new CryptoCipher_1(cipherBuffer, value.alg, nonceBuffer, counter));
+        else {
+            CryptoValidation_1.CryptoValidation.checkBuffer(value.cipher, CryptoCipher_1.MIN_CIPHER_BYTES, CryptoCipher_1.MAX_CIPHER_BYTES, "cipher");
+        }
+        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.algorithm);
+        if (value.counter) {
+            CryptoValidation_1.CryptoValidation.checkCounter(value.counter);
+        }
+        if (value.nonce) {
+            CryptoValidation_1.CryptoValidation.checkNonce(value.nonce, value.algorithm);
+        }
+        return value;
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromJSON(value) {
+        return this.fromAny(value);
     }
-    static async deserialize(value) {
-        const obj = JSON.parse(value);
-        return await this.fromJSON(obj);
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
 };
 CryptoCipher.MIN_CIPHER_BYTES = 2;
 CryptoCipher.MAX_CIPHER_BYTES = 100 * 1024 * 1024;
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoCipher.prototype, "algorithm", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoCipher.prototype, "cipher", void 0);
+__decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoCipher.prototype, "counter", void 0);
+__decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoCipher.prototype, "nonce", void 0);
 CryptoCipher = CryptoCipher_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoCipher"),
-    __metadata("design:paramtypes", [CoreBuffer_1.CoreBuffer, Number, CoreBuffer_1.CoreBuffer, Number])
+    (0, ts_serval_1.type)("CryptoCipher")
 ], CryptoCipher);
 exports.CryptoCipher = CryptoCipher;
 //# sourceMappingURL=CryptoCipher.js.map

package/dist/encryption/CryptoCipher.js.map

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

package/dist/encryption/CryptoEncryption.js

@@ -24,8 +24,7 @@ class CryptoEncryption {
             default:
                 throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.NotYetImplemented);
         }
-        const secretKey = new CryptoSecretKey_1.CryptoSecretKey(buffer, algorithm);
-        return secretKey;
+        return CryptoSecretKey_1.CryptoSecretKey.from({ secretKey: buffer, algorithm });
     }
     /**
      * Encrypts a given plaintext [[CoreBuffer]] object with the given secretKey. If a nonce is set,
@@ -38,11 +37,9 @@ class CryptoEncryption {
      * @param algorithm
      */
     static async encrypt(plaintext, secretKey, nonce, algorithm = 3 /* XCHACHA20_POLY1305 */) {
-        CryptoValidation_1.CryptoValidation.checkPlaintext(plaintext);
         let correctAlgorithm;
         let secretKeyBuffer;
         if (secretKey instanceof CryptoSecretKey_1.CryptoSecretKey) {
-            CryptoValidation_1.CryptoValidation.checkSecretKey(secretKey);
             correctAlgorithm = secretKey.algorithm;
             secretKeyBuffer = secretKey.secretKey.buffer;
         }
@@ -64,26 +61,29 @@ class CryptoEncryption {
         else {
             publicnonce = sodium.randombytes_buf(24);
         }
-        let cipherbuffer;
+        let cipher;
         switch (correctAlgorithm) {
             case 3 /* XCHACHA20_POLY1305 */:
                 try {
-                    const cipher = sodium.crypto_aead_xchacha20poly1305_ietf_encrypt(plaintext.buffer, "", new Uint8Array(), publicnonce, secretKeyBuffer);
-                    cipherbuffer = new CoreBuffer_1.CoreBuffer(cipher);
-                    return new CryptoCipher_1.CryptoCipher(cipherbuffer, correctAlgorithm, new CoreBuffer_1.CoreBuffer(publicnonce));
+                    cipher = sodium.crypto_aead_xchacha20poly1305_ietf_encrypt(plaintext.buffer, "", new Uint8Array(), publicnonce, secretKeyBuffer);
                 }
                 catch (e) {
                     throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionEncrypt, `${e}`);
                 }
+                break;
             default:
                 throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.NotYetImplemented);
         }
+        return CryptoCipher_1.CryptoCipher.from({
+            cipher: CoreBuffer_1.CoreBuffer.from(cipher),
+            algorithm: correctAlgorithm,
+            nonce: CoreBuffer_1.CoreBuffer.from(publicnonce)
+        });
     }
     static async encryptWithCounter(plaintext, secretKey, nonce, counter, algorithm = 3 /* XCHACHA20_POLY1305 */) {
         let correctAlgorithm;
         let secretKeyBuffer;
         if (secretKey instanceof CryptoSecretKey_1.CryptoSecretKey) {
-            CryptoValidation_1.CryptoValidation.checkSecretKey(secretKey);
             correctAlgorithm = secretKey.algorithm;
             secretKeyBuffer = secretKey.secretKey.buffer;
         }
@@ -104,7 +104,7 @@ class CryptoEncryption {
                 try {
                     const cipher = (await SodiumWrapper_1.SodiumWrapper.ready()).crypto_aead_xchacha20poly1305_ietf_encrypt(plaintext.buffer, "", new Uint8Array(), publicnonce.buffer, secretKeyBuffer);
                     cipherbuffer = new CoreBuffer_1.CoreBuffer(cipher);
-                    return new CryptoCipher_1.CryptoCipher(cipherbuffer, algorithm, undefined, counter);
+                    return CryptoCipher_1.CryptoCipher.from({ cipher: cipherbuffer, algorithm, counter });
                 }
                 catch (e) {
                     throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionEncrypt, `${e}`);
@@ -114,11 +114,9 @@ class CryptoEncryption {
         }
     }
     static async decrypt(cipher, secretKey, nonce, algorithm = 3 /* XCHACHA20_POLY1305 */) {
-        CryptoValidation_1.CryptoValidation.checkCipher(cipher);
         let correctAlgorithm;
         let secretKeyBuffer;
         if (secretKey instanceof CryptoSecretKey_1.CryptoSecretKey) {
-            CryptoValidation_1.CryptoValidation.checkSecretKey(secretKey);
             correctAlgorithm = secretKey.algorithm;
             secretKeyBuffer = secretKey.secretKey.buffer;
         }

package/dist/encryption/CryptoEncryption.js.map

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

package/dist/encryption/CryptoSecretKey.d.ts

@@ -1,6 +1,6 @@
 import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoEncryptionAlgorithm } from "./CryptoEncryption";
 export interface ICryptoSecretKeySerialized extends ISerialized {
     alg: number;
@@ -10,14 +10,13 @@ export interface ICryptoSecretKey extends ISerializable {
     algorithm: CryptoEncryptionAlgorithm;
     secretKey: ICoreBuffer;
 }
-export declare class CryptoSecretKey extends CryptoSerializableAsync implements ICryptoSecretKey, IClearable {
-    readonly algorithm: CryptoEncryptionAlgorithm;
-    readonly secretKey: CoreBuffer;
-    constructor(secretKey: CoreBuffer, algorithm?: CryptoEncryptionAlgorithm);
+export declare class CryptoSecretKey extends CryptoSerializable implements ICryptoSecretKey, IClearable {
+    algorithm: CryptoEncryptionAlgorithm;
+    secretKey: CoreBuffer;
     toJSON(verbose?: boolean): ICryptoSecretKeySerialized;
     clear(): void;
-    static from(value: CryptoSecretKey | ICryptoSecretKey): Promise<CryptoSecretKey>;
-    static fromJSON(value: ICryptoSecretKeySerialized): Promise<CryptoSecretKey>;
-    static fromBase64(value: string): Promise<CryptoSecretKey>;
-    static deserialize(value: string): Promise<CryptoSecretKey>;
+    static from(value: CryptoSecretKey | ICryptoSecretKey): CryptoSecretKey;
+    protected static preFrom(value: any): any;
+    static fromJSON(value: ICryptoSecretKeySerialized): CryptoSecretKey;
+    static fromBase64(value: string): CryptoSecretKey;
 }

package/dist/encryption/CryptoSecretKey.js

@@ -8,57 +8,61 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var CryptoSecretKey_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoSecretKey = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoValidation_1 = require("../CryptoValidation");
-let CryptoSecretKey = CryptoSecretKey_1 = class CryptoSecretKey extends CryptoSerializableAsync_1.CryptoSerializableAsync {
-    constructor(secretKey, algorithm = 3 /* XCHACHA20_POLY1305 */) {
-        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(algorithm);
-        CryptoValidation_1.CryptoValidation.checkSecretKeyForAlgorithm(secretKey, algorithm);
-        super();
-        this.algorithm = algorithm;
-        this.secretKey = secretKey;
-    }
+let CryptoSecretKey = class CryptoSecretKey extends CryptoSerializable_1.CryptoSerializable {
     toJSON(verbose = true) {
-        const obj = {
+        return {
             key: this.secretKey.toBase64URL(),
-            alg: this.algorithm
+            alg: this.algorithm,
+            "@type": verbose ? "CryptoSecretKey" : undefined
         };
-        if (verbose) {
-            obj["@type"] = "CryptoSecretKey";
-        }
-        return obj;
     }
     clear() {
         this.secretKey.clear();
     }
     static from(value) {
-        return Promise.resolve(new CryptoSecretKey_1(CoreBuffer_1.CoreBuffer.from(value.secretKey), value.algorithm));
+        return this.fromAny(value);
     }
-    static async fromJSON(value) {
-        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.alg);
-        CryptoValidation_1.CryptoValidation.checkSerializedSecretKeyForAlgorithm(value.key, value.alg);
-        const buffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.key);
-        return await this.from({
-            algorithm: value.alg,
-            secretKey: buffer
-        });
+    static preFrom(value) {
+        if (value.alg) {
+            value = {
+                algorithm: value.alg,
+                secretKey: value.key
+            };
+        }
+        CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.algorithm);
+        if (typeof value.secretKey === "string") {
+            CryptoValidation_1.CryptoValidation.checkSerializedSecretKeyForAlgorithm(value.secretKey, value.algorithm);
+        }
+        else {
+            CryptoValidation_1.CryptoValidation.checkSecretKeyForAlgorithm(value.secretKey, value.algorithm);
+        }
+        return value;
+    }
+    static fromJSON(value) {
+        return this.fromAny(value);
     }
     static fromBase64(value) {
         return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
-        const obj = JSON.parse(value);
-        return await this.fromJSON(obj);
-    }
 };
-CryptoSecretKey = CryptoSecretKey_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoSecretKey"),
-    __metadata("design:paramtypes", [CoreBuffer_1.CoreBuffer, Number])
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoSecretKey.prototype, "algorithm", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoSecretKey.prototype, "secretKey", void 0);
+CryptoSecretKey = __decorate([
+    (0, ts_serval_1.type)("CryptoSecretKey")
 ], CryptoSecretKey);
 exports.CryptoSecretKey = CryptoSecretKey;
 //# sourceMappingURL=CryptoSecretKey.js.map

package/dist/encryption/CryptoSecretKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoSecretKey.js","sourceRoot":"","sources":["../../src/encryption/CryptoSecretKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAsE;AACtE,8CAAoE;AACpE,wEAAqE;AACrE,0DAAuD;AAcvD,IAAa,eAAe,uBAA5B,MAAa,eAAgB,SAAQ,iDAAuB;IAIxD,YACI,SAAqB,EACrB,sCAAmF;QAEnF,mCAAgB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACrD,mCAAgB,CAAC,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAA+B;YACpC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YACjC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAC;SACpC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyC;QACxD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,iBAAe,CAAC,uBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACnG,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAiC;QAC1D,mCAAgB,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,mCAAgB,CAAC,oCAAoC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAgC,CAAC,CAAC;QAEzG,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,KAAK,CAAC,GAAgC;YACjD,SAAS,EAAE,MAAM;SACpB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAvDY,eAAe;IAD3B,IAAA,gBAAI,EAAC,iBAAiB,CAAC;qCAML,uBAAU;GALhB,eAAe,CAuD3B;AAvDY,0CAAe"}
+{"version":3,"file":"CryptoSecretKey.js","sourceRoot":"","sources":["../../src/encryption/CryptoSecretKey.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA2F;AAC3F,8CAAoE;AACpE,8DAA2D;AAC3D,0DAAuD;AAcvD,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,uCAAkB;IAQnC,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YACjC,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS;SACnD,CAAC;IACN,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyC;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAES,MAAM,CAAU,OAAO,CAAC,KAAU;QACxC,IAAI,KAAK,CAAC,GAAG,EAAE;YACX,KAAK,GAAG;gBACJ,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,SAAS,EAAE,KAAK,CAAC,GAAG;aACvB,CAAC;SACL;QAED,mCAAgB,CAAC,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE3D,IAAI,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE;YACrC,mCAAgB,CAAC,oCAAoC,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;SAC3F;aAAM;YACH,mCAAgB,CAAC,0BAA0B,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;SACjF;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAiC;QACpD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AA/CG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;kDACgC;AAG5C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,uBAAU;kDAAC;AANpB,eAAe;IAD3B,IAAA,gBAAI,EAAC,iBAAiB,CAAC;GACX,eAAe,CAkD3B;AAlDY,0CAAe"}

package/dist/exchange/CryptoExchange.d.ts

@@ -1,6 +1,5 @@
 import { CryptoEncryptionAlgorithm } from "../encryption/CryptoEncryption";
 import { CryptoExchangeKeypair } from "./CryptoExchangeKeypair";
-import { CryptoExchangePrivateKey } from "./CryptoExchangePrivateKey";
 import { CryptoExchangePublicKey } from "./CryptoExchangePublicKey";
 import { CryptoExchangeSecrets } from "./CryptoExchangeSecrets";
 export declare const enum CryptoExchangeAlgorithm {
@@ -9,7 +8,6 @@ export declare const enum CryptoExchangeAlgorithm {
     ECDH_X25519 = 3
 }
 export declare class CryptoExchange {
-    static privateKeyToPublicKey(privateKey: CryptoExchangePrivateKey): Promise<CryptoExchangePublicKey>;
     /**
      * Generates a keypair for the specified key exchange algorithm
      *

package/dist/exchange/CryptoExchange.js

@@ -10,23 +10,6 @@ const CryptoExchangePrivateKey_1 = require("./CryptoExchangePrivateKey");
 const CryptoExchangePublicKey_1 = require("./CryptoExchangePublicKey");
 const CryptoExchangeSecrets_1 = require("./CryptoExchangeSecrets");
 class CryptoExchange {
-    static async privateKeyToPublicKey(privateKey) {
-        switch (privateKey.algorithm) {
-            case 3 /* ECDH_X25519 */:
-                try {
-                    const publicKey = (await SodiumWrapper_1.SodiumWrapper.ready()).crypto_scalarmult_base(privateKey.privateKey.buffer);
-                    return await CryptoExchangePublicKey_1.CryptoExchangePublicKey.from({
-                        algorithm: privateKey.algorithm,
-                        publicKey: CoreBuffer_1.CoreBuffer.from(publicKey)
-                    });
-                }
-                catch (e) {
-                    throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeKeyGeneration, `${e}`);
-                }
-            default:
-                throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.NotYetImplemented);
-        }
-    }
     /**
      * Generates a keypair for the specified key exchange algorithm
      *
@@ -51,9 +34,9 @@ class CryptoExchange {
             default:
                 throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.NotYetImplemented);
         }
-        const privateKey = new CryptoExchangePrivateKey_1.CryptoExchangePrivateKey(algorithm, new CoreBuffer_1.CoreBuffer(privateKeyBuffer));
-        const publicKey = new CryptoExchangePublicKey_1.CryptoExchangePublicKey(algorithm, new CoreBuffer_1.CoreBuffer(publicKeyBuffer));
-        const keypair = new CryptoExchangeKeypair_1.CryptoExchangeKeypair(publicKey, privateKey);
+        const privateKey = CryptoExchangePrivateKey_1.CryptoExchangePrivateKey.from({ algorithm, privateKey: CoreBuffer_1.CoreBuffer.from(privateKeyBuffer) });
+        const publicKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.from({ algorithm, publicKey: CoreBuffer_1.CoreBuffer.from(publicKeyBuffer) });
+        const keypair = CryptoExchangeKeypair_1.CryptoExchangeKeypair.from({ publicKey, privateKey });
         return keypair;
     }
     /**
@@ -80,7 +63,7 @@ class CryptoExchange {
         catch (e) {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeKeyDerivation, `${e}`);
         }
-        const secrets = await CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
+        const secrets = CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
             receivingKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedRx),
             transmissionKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedTx),
             algorithm: algorithm
@@ -111,7 +94,7 @@ class CryptoExchange {
         catch (e) {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeKeyDerivation, `${e}`);
         }
-        const secrets = await CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
+        const secrets = CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
             receivingKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedRx),
             transmissionKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedTx),
             algorithm: algorithm

package/dist/exchange/CryptoExchange.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchange.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchange.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,gDAA6C;AAC7C,wDAAqD;AAErD,oDAAiD;AACjD,mEAAgE;AAChE,yEAAsE;AACtE,uEAAoE;AACpE,mEAAgE;AAWhE,MAAa,cAAc;IAChB,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,UAAoC;QAC1E,QAAQ,UAAU,CAAC,SAAS,EAAE;YAC1B;gBACI,IAAI;oBACA,MAAM,SAAS,GAAG,CAAC,MAAM,6BAAa,CAAC,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAClE,UAAU,CAAC,UAAU,CAAC,MAAM,CAC/B,CAAC;oBACF,OAAO,MAAM,iDAAuB,CAAC,IAAI,CAAC;wBACtC,SAAS,EAAE,UAAU,CAAC,SAAS;wBAC/B,SAAS,EAAE,uBAAU,CAAC,IAAI,CAAC,SAAS,CAAC;qBACxC,CAAC,CAAC;iBACN;gBAAC,OAAO,CAAC,EAAE;oBACR,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,qBAAqB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;iBACxE;YACL;gBACI,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,CAAC,CAAC;SAChE;IACL,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,eAAe,CAC/B,+BAAwE;QAExE,IAAI,gBAAgB,CAAC;QACrB,IAAI,eAAe,CAAC;QAEpB,QAAQ,SAAmB,EAAE;YACzB;gBACI,IAAI,IAAI,CAAC;gBACT,IAAI;oBACA,IAAI,GAAG,CAAC,MAAM,6BAAa,CAAC,KAAK,EAAE,CAAC,CAAC,iBAAiB,EAAE,CAAC;iBAC5D;gBAAC,OAAO,CAAM,EAAE;oBACb,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,qBAAqB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;iBACxE;gBACD,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC;gBACnC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC;gBACjC,MAAM;YACV;gBACI,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,CAAC,CAAC;SAChE;QAED,MAAM,UAAU,GAAG,IAAI,mDAAwB,CAAC,SAAS,EAAE,IAAI,uBAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC7F,MAAM,SAAS,GAAG,IAAI,iDAAuB,CAAC,SAAS,EAAE,IAAI,uBAAU,CAAC,eAAe,CAAC,CAAC,CAAC;QAC1F,MAAM,OAAO,GAAG,IAAI,6CAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEjE,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACI,MAAM,CAAC,KAAK,CAAC,eAAe,CAC/B,gBAAuC,EACvC,kBAA2C,EAC3C,sCAAmF;QAEnF,IAAI,SAAS,CAAC;QACd,IAAI;YACA,SAAS,GAAG,CAAC,MAAM,6BAAa,CAAC,KAAK,EAAE,CAAC,CAAC,6BAA6B,CACnE,gBAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAC3C,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAC7C,kBAAkB,CAAC,SAAS,CAAC,MAAM,CACtC,CAAC;SACL;QAAC,OAAO,CAAM,EAAE;YACb,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,qBAAqB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;SACxE;QAED,MAAM,OAAO,GAAG,MAAM,6CAAqB,CAAC,IAAI,CAAC;YAC7C,YAAY,EAAE,uBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YACjD,eAAe,EAAE,uBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YACpD,SAAS,EAAE,SAAS;SACvB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACI,MAAM,CAAC,KAAK,CAAC,eAAe,CAC/B,gBAAuC,EACvC,kBAA2C,EAC3C,sCAAmF;QAEnF,IAAI,SAAS,CAAC;QACd,IAAI;YACA,SAAS,GAAG,CAAC,MAAM,6BAAa,CAAC,KAAK,EAAE,CAAC,CAAC,6BAA6B,CACnE,gBAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAC3C,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAC7C,kBAAkB,CAAC,SAAS,CAAC,MAAM,CACtC,CAAC;SACL;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,qBAAqB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;SACxE;QAED,MAAM,OAAO,GAAG,MAAM,6CAAqB,CAAC,IAAI,CAAC;YAC7C,YAAY,EAAE,uBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YACjD,eAAe,EAAE,uBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YACpD,SAAS,EAAE,SAAS;SACvB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AArID,wCAqIC"}
+{"version":3,"file":"CryptoExchange.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchange.ts"],"names":[],"mappings":"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"}

package/dist/exchange/CryptoExchangeKeypair.d.ts

@@ -1,24 +1,23 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { IClearable } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoExchangePrivateKey, ICryptoExchangePrivateKey, ICryptoExchangePrivateKeySerialized } from "./CryptoExchangePrivateKey";
 import { CryptoExchangePublicKey, ICryptoExchangePublicKey, ICryptoExchangePublicKeySerialized } from "./CryptoExchangePublicKey";
 export interface ICryptoExchangeKeypairSerialized extends ISerialized {
     pub: ICryptoExchangePublicKeySerialized;
     prv: ICryptoExchangePrivateKeySerialized;
 }
-export interface ICryptoExchangeKeypair extends ISerializableAsync {
+export interface ICryptoExchangeKeypair extends ISerializable {
     publicKey: ICryptoExchangePublicKey;
     privateKey: ICryptoExchangePrivateKey;
 }
-export declare class CryptoExchangeKeypair extends CryptoSerializableAsync implements ICryptoExchangeKeypair, IClearable {
-    readonly publicKey: CryptoExchangePublicKey;
-    readonly privateKey: CryptoExchangePrivateKey;
-    constructor(publicKey: CryptoExchangePublicKey, privateKey: CryptoExchangePrivateKey);
+export declare class CryptoExchangeKeypair extends CryptoSerializable implements ICryptoExchangeKeypair, IClearable {
+    publicKey: CryptoExchangePublicKey;
+    privateKey: CryptoExchangePrivateKey;
     toJSON(verbose?: boolean): ICryptoExchangeKeypairSerialized;
     clear(): void;
-    static from(value: CryptoExchangeKeypair | ICryptoExchangeKeypair): Promise<CryptoExchangeKeypair>;
-    static fromJSON(value: ICryptoExchangeKeypairSerialized): Promise<CryptoExchangeKeypair>;
-    static fromBase64(value: string): Promise<CryptoExchangeKeypair>;
-    static deserialize(value: string): Promise<CryptoExchangeKeypair>;
+    protected static preFrom(value: any): any;
+    static from(value: CryptoExchangeKeypair | ICryptoExchangeKeypair): CryptoExchangeKeypair;
+    static fromJSON(value: ICryptoExchangeKeypairSerialized): CryptoExchangeKeypair;
+    static fromBase64(value: string): CryptoExchangeKeypair;
 }