@nmshd/crypto 2.2.0-alpha.1 → 2.2.0-alpha.2

package/dist/CryptoErrorCode.d.ts

@@ -49,5 +49,6 @@ export declare enum CryptoErrorCode {
     CalProvidersAlreadyInitialized = "error.crypto.cal.providersAlreadyInitialized",
     CalImportOfKey = "error.crypto.cal.calImportOfKey",
     CalKeyDerivation = "error.crypto.cal.keyDerivation",
+    CalLoadKey = "error.crypto.cal.loadKey",
     DeserializeValidation = "error.deserialize.validation"
 }

package/dist/CryptoErrorCode.js

@@ -53,6 +53,7 @@ var CryptoErrorCode;
     CryptoErrorCode["CalProvidersAlreadyInitialized"] = "error.crypto.cal.providersAlreadyInitialized";
     CryptoErrorCode["CalImportOfKey"] = "error.crypto.cal.calImportOfKey";
     CryptoErrorCode["CalKeyDerivation"] = "error.crypto.cal.keyDerivation";
+    CryptoErrorCode["CalLoadKey"] = "error.crypto.cal.loadKey";
     CryptoErrorCode["DeserializeValidation"] = "error.deserialize.validation";
 })(CryptoErrorCode || (exports.CryptoErrorCode = CryptoErrorCode = {}));
 //# sourceMappingURL=CryptoErrorCode.js.map

package/dist/CryptoErrorCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoErrorCode.js","sourceRoot":"","sources":["../src/CryptoErrorCode.ts"],"names":[],"mappings":";;;AAAA,IAAY,eA8DX;AA9DD,WAAY,eAAe;IACvB,uEAAoD,CAAA;IACpD,mDAAgC,CAAA;IAEhC,qEAAkD,CAAA;IAClD,2DAAwC,CAAA;IACxC,gEAA6C,CAAA;IAE7C,uDAAoC,CAAA;IAEpC,2DAAwC,CAAA;IACxC,2DAAwC,CAAA;IACxC,+EAA4D,CAAA;IAC5D,8EAA2D,CAAA;IAC3D,mDAAgC,CAAA;IAEhC,qFAAkE,CAAA;IAClE,sFAAmE,CAAA;IACnE,gFAA6D,CAAA;IAC7D,sFAAmE,CAAA;IACnE,8EAA2D,CAAA;IAC3D,kFAA+D,CAAA;IAC/D,oFAAiE,CAAA;IACjE,wEAAqD,CAAA;IACrD,wEAAqD,CAAA;IACrD,4FAAyE,CAAA;IACzE,wFAAqE,CAAA;IAErE,gFAA6D,CAAA;IAC7D,gFAA6D,CAAA;IAC7D,0FAAuE,CAAA;IACvE,oFAAiE,CAAA;IACjE,kFAA+D,CAAA;IAE/D,0EAAuD,CAAA;IACvD,6GAA0F,CAAA;IAE1F,kFAA+D,CAAA;IAC/D,oFAAiE,CAAA;IACjE,sFAAmE,CAAA;IACnE,oFAAiE,CAAA;IACjE,gEAA6C,CAAA;IAC7C,oEAAiD,CAAA;IAEjD,4EAAyD,CAAA;IACzD,oEAAiD,CAAA;IACjD,wEAAqD,CAAA;IACrD,2EAAwD,CAAA;IACxD,kEAA+C,CAAA;IAE/C,wEAAqD,CAAA;IACrD,oFAAiE,CAAA;IACjE,sEAAmD,CAAA;IACnD,4EAAyD,CAAA;IACzD,0EAAuD,CAAA;IACvD,0FAAuE,CAAA;IACvE,gGAA6E,CAAA;IAC7E,kGAA+E,CAAA;IAC/E,qEAAkD,CAAA;IAClD,sEAAmD,CAAA;IAEnD,yEAAsD,CAAA;AAC1D,CAAC,EA9DW,eAAe,+BAAf,eAAe,QA8D1B"}
+{"version":3,"file":"CryptoErrorCode.js","sourceRoot":"","sources":["../src/CryptoErrorCode.ts"],"names":[],"mappings":";;;AAAA,IAAY,eA+DX;AA/DD,WAAY,eAAe;IACvB,uEAAoD,CAAA;IACpD,mDAAgC,CAAA;IAEhC,qEAAkD,CAAA;IAClD,2DAAwC,CAAA;IACxC,gEAA6C,CAAA;IAE7C,uDAAoC,CAAA;IAEpC,2DAAwC,CAAA;IACxC,2DAAwC,CAAA;IACxC,+EAA4D,CAAA;IAC5D,8EAA2D,CAAA;IAC3D,mDAAgC,CAAA;IAEhC,qFAAkE,CAAA;IAClE,sFAAmE,CAAA;IACnE,gFAA6D,CAAA;IAC7D,sFAAmE,CAAA;IACnE,8EAA2D,CAAA;IAC3D,kFAA+D,CAAA;IAC/D,oFAAiE,CAAA;IACjE,wEAAqD,CAAA;IACrD,wEAAqD,CAAA;IACrD,4FAAyE,CAAA;IACzE,wFAAqE,CAAA;IAErE,gFAA6D,CAAA;IAC7D,gFAA6D,CAAA;IAC7D,0FAAuE,CAAA;IACvE,oFAAiE,CAAA;IACjE,kFAA+D,CAAA;IAE/D,0EAAuD,CAAA;IACvD,6GAA0F,CAAA;IAE1F,kFAA+D,CAAA;IAC/D,oFAAiE,CAAA;IACjE,sFAAmE,CAAA;IACnE,oFAAiE,CAAA;IACjE,gEAA6C,CAAA;IAC7C,oEAAiD,CAAA;IAEjD,4EAAyD,CAAA;IACzD,oEAAiD,CAAA;IACjD,wEAAqD,CAAA;IACrD,2EAAwD,CAAA;IACxD,kEAA+C,CAAA;IAE/C,wEAAqD,CAAA;IACrD,oFAAiE,CAAA;IACjE,sEAAmD,CAAA;IACnD,4EAAyD,CAAA;IACzD,0EAAuD,CAAA;IACvD,0FAAuE,CAAA;IACvE,gGAA6E,CAAA;IAC7E,kGAA+E,CAAA;IAC/E,qEAAkD,CAAA;IAClD,sEAAmD,CAAA;IACnD,0DAAuC,CAAA;IAEvC,yEAAsD,CAAA;AAC1D,CAAC,EA/DW,eAAe,+BAAf,eAAe,QA+D1B"}

package/dist/buildInformation.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildInformation = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 exports.buildInformation = {
-    version: "2.2.0-alpha.1",
-    build: "34",
-    date: "2025-06-03T10:31:35+00:00",
-    commit: "2cac5b712dc2e7f095e424c247513e27e5c6db61",
+    version: "2.2.0-alpha.2",
+    build: "36",
+    date: "2025-06-23T06:17:54+00:00",
+    commit: "8d462185da38dd17ca0b4e7463609b325351b149",
     dependencies: {"@nmshd/rs-crypto-types":"^0.10.0","libsodium-wrappers-sumo":"0.7.15","uuid":"^11.1.0"},
     libraries: {
         serval: ts_serval_1.buildInformation

package/dist/crypto-layer/CryptoDerivationHandle.js

@@ -7,6 +7,7 @@ const CryptoErrorCode_1 = require("../CryptoErrorCode");
 const CryptoValidation_1 = require("../CryptoValidation");
 const CryptoLayerProviders_1 = require("./CryptoLayerProviders");
 const CryptoLayerUtils_1 = require("./CryptoLayerUtils");
+const CryptoEncryptionHandle_1 = require("./encryption/CryptoEncryptionHandle");
 const DeviceBoundDerivedKeyHandle_1 = require("./encryption/DeviceBoundDerivedKeyHandle");
 const PortableDerivedKeyHandle_1 = require("./encryption/PortableDerivedKeyHandle");
 class CryptoDerivationHandle {
@@ -21,7 +22,7 @@ class CryptoDerivationHandle {
         catch (e) {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.CalKeyDerivation, `Provider ${await provider.providerName()} failed to derive key from password.`, undefined, e, CryptoDerivationHandle.deriveKeyHandleFromPassword);
         }
-        return await constructor.fromProviderAndKeyHandle(provider, keyHandle);
+        return await CryptoEncryptionHandle_1.CryptoEncryptionHandle._keyHandleFromProviderAndCalKeyHandle(constructor, provider, keyHandle);
     }
     /**
      * Derive an ephemeral {@link DeviceBoundDerivedKeyHandle} from a password.
@@ -56,7 +57,7 @@ class CryptoDerivationHandle {
         catch (e) {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.CalKeyDerivation, `Failed to derive key from base key.`, undefined, e, CryptoDerivationHandle.deriveKeyFromBaseKeyHandle);
         }
-        return await constructor.fromProviderAndKeyHandle(baseKey.provider, keyHandle);
+        return await CryptoEncryptionHandle_1.CryptoEncryptionHandle._keyHandleFromProviderAndCalKeyHandle(constructor, baseKey.provider, keyHandle);
     }
     /**
      * Derive an ephemeral {@link DeviceBoundDerivedKeyHandle} from a {@link DeviceBoundKeyHandle} with the same algorithms.

package/dist/crypto-layer/CryptoDerivationHandle.js.map

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

package/dist/crypto-layer/encryption/BaseDerivedKeyHandle.d.ts

@@ -0,0 +1,15 @@
+import { KeyHandle, Provider } from "@nmshd/rs-crypto-types";
+import { CryptoEncryptionAlgorithm } from "../../encryption/CryptoEncryption";
+import { CryptoHashAlgorithm } from "../../hash/CryptoHash";
+/**
+ * Variant of {@link BaseKeyHandle} without serialization and deserialization.
+ */
+export declare abstract class BaseDerivedKeyHandle {
+    id: string;
+    providerName: string;
+    provider: Provider;
+    keyHandle: KeyHandle;
+    encryptionAndHashAlgorithm(): Promise<[CryptoEncryptionAlgorithm, CryptoHashAlgorithm]>;
+    encryptionAlgorithm(): Promise<CryptoEncryptionAlgorithm>;
+    hashAlgorithm(): Promise<CryptoHashAlgorithm>;
+}

package/dist/crypto-layer/encryption/BaseDerivedKeyHandle.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseDerivedKeyHandle = void 0;
+const CryptoLayerUtils_1 = require("../CryptoLayerUtils");
+/**
+ * Variant of {@link BaseKeyHandle} without serialization and deserialization.
+ */
+class BaseDerivedKeyHandle {
+    async encryptionAndHashAlgorithm() {
+        const spec = await this.keyHandle.spec();
+        return [
+            CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(spec.cipher),
+            CryptoLayerUtils_1.CryptoLayerUtils.cryptoHashAlgorithmFromCryptoHash(spec.signing_hash)
+        ];
+    }
+    async encryptionAlgorithm() {
+        const spec = await this.keyHandle.spec();
+        return CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(spec.cipher);
+    }
+    async hashAlgorithm() {
+        const spec = await this.keyHandle.spec();
+        return CryptoLayerUtils_1.CryptoLayerUtils.cryptoHashAlgorithmFromCryptoHash(spec.signing_hash);
+    }
+}
+exports.BaseDerivedKeyHandle = BaseDerivedKeyHandle;
+//# sourceMappingURL=BaseDerivedKeyHandle.js.map

package/dist/crypto-layer/encryption/BaseDerivedKeyHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseDerivedKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/BaseDerivedKeyHandle.ts"],"names":[],"mappings":";;;AAGA,0DAAuD;AAEvD;;GAEG;AACH,MAAsB,oBAAoB;IAO/B,KAAK,CAAC,0BAA0B;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO;YACH,mCAAgB,CAAC,mCAAmC,CAAC,IAAI,CAAC,MAAM,CAAC;YACjE,mCAAgB,CAAC,iCAAiC,CAAC,IAAI,CAAC,YAAY,CAAC;SACxE,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,mBAAmB;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO,mCAAgB,CAAC,mCAAmC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,aAAa;QACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO,mCAAgB,CAAC,iCAAiC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjF,CAAC;CACJ;AAxBD,oDAwBC"}

package/dist/crypto-layer/encryption/BaseKeyHandle.d.ts

@@ -1,27 +1,15 @@
 import { ISerializable, ISerialized, SerializableAsync } from "@js-soft/ts-serval";
-import { KeyHandle, KeySpec, Provider } from "@nmshd/rs-crypto-types";
-import { CoreBuffer, ICoreBuffer } from "../../CoreBuffer";
+import { KeyHandle, Provider } from "@nmshd/rs-crypto-types";
 import { CryptoSerializableAsync } from "../../CryptoSerializable";
-import { ProviderIdentifier } from "../CryptoLayerProviders";
+import { CryptoEncryptionAlgorithm } from "../../encryption/CryptoEncryption";
+import { CryptoHashAlgorithm } from "../../hash/CryptoHash";
 export interface IBaseKeyHandleSerialized extends ISerialized {
     kid: string;
     pnm: string;
-    spc: KeySpec;
 }
 export interface IBaseKeyHandle extends ISerializable {
     id: string;
     providerName: string;
-    spec: KeySpec;
-}
-export interface BaseKeyHandleConstructor<T extends BaseKeyHandle> {
-    new (): T;
-    deserialize(value: string): Promise<T>;
-    fromProviderAndKeyHandle(provider: Provider, keyHandle: KeyHandle, other?: {
-        providerName?: string;
-        keyId?: string;
-        keySpec?: KeySpec;
-    }): Promise<T>;
-    fromAny(value: any): Promise<T>;
 }
 /**
  * Represents a handle to a secret key used for symmetric encryption/decryption within the crypto layer.
@@ -31,29 +19,11 @@ export interface BaseKeyHandleConstructor<T extends BaseKeyHandle> {
 export declare abstract class BaseKeyHandle extends CryptoSerializableAsync implements IBaseKeyHandle {
     id: string;
     providerName: string;
-    spec: KeySpec;
     provider: Provider;
     keyHandle: KeyHandle;
-    /**
-     * Deserializes an object representation of a {@link BaseKeyHandle}.
-     *
-     * This method is not able to import raw keys or {@link KeyHandle}.
-     */
-    static from<T extends BaseKeyHandle>(this: BaseKeyHandleConstructor<T>, value: BaseKeyHandleConstructor<T> | IBaseKeyHandle | CoreBuffer): Promise<T>;
-    /** @see from */
-    static fromJSON<T extends BaseKeyHandle>(this: BaseKeyHandleConstructor<T>, value: IBaseKeyHandleSerialized): Promise<T>;
-    /** @see from */
-    static fromBase64<T extends BaseKeyHandle>(this: BaseKeyHandleConstructor<T>, value: string): Promise<T>;
-    /**
-     * Creates a new {@link BaseKeyHandle} or its child from an existing {@link KeyHandle}.
-     */
-    static fromProviderAndKeyHandle<T extends BaseKeyHandle>(this: new () => T, provider: Provider, keyHandle: KeyHandle): Promise<T>;
+    encryptionAndHashAlgorithm(): Promise<[CryptoEncryptionAlgorithm, CryptoHashAlgorithm]>;
+    encryptionAlgorithm(): Promise<CryptoEncryptionAlgorithm>;
+    hashAlgorithm(): Promise<CryptoHashAlgorithm>;
     protected static preFrom(value: any): any;
     static postFrom<T extends SerializableAsync>(value: T): Promise<T>;
 }
-export declare abstract class ImportableBaseKeyHandle extends BaseKeyHandle {
-    /**
-     * Creates a new {@link BaseKeyHandle} or its child by importing a raw key into a provider.
-     */
-    static fromRawKey<T extends ImportableBaseKeyHandle>(this: BaseKeyHandleConstructor<T>, providerIdent: ProviderIdentifier, rawKey: ICoreBuffer, spec: KeySpec): Promise<T>;
-}

package/dist/crypto-layer/encryption/BaseKeyHandle.js

@@ -8,50 +8,35 @@ 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 BaseKeyHandle_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportableBaseKeyHandle = exports.BaseKeyHandle = void 0;
+exports.BaseKeyHandle = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
-const checks_1 = require("@nmshd/rs-crypto-types/checks");
-const CoreBuffer_1 = require("../../CoreBuffer");
 const CryptoError_1 = require("../../CryptoError");
 const CryptoErrorCode_1 = require("../../CryptoErrorCode");
 const CryptoSerializable_1 = require("../../CryptoSerializable");
 const CryptoLayerProviders_1 = require("../CryptoLayerProviders");
+const CryptoLayerUtils_1 = require("../CryptoLayerUtils");
 /**
  * Represents a handle to a secret key used for symmetric encryption/decryption within the crypto layer.
  * This handle encapsulates a reference to the key material, managed by the underlying crypto provider,
  * without exposing the raw key material directly.
  */
-let BaseKeyHandle = class BaseKeyHandle extends CryptoSerializable_1.CryptoSerializableAsync {
-    /**
-     * Deserializes an object representation of a {@link BaseKeyHandle}.
-     *
-     * This method is not able to import raw keys or {@link KeyHandle}.
-     */
-    static async from(value) {
-        return await this.fromAny(value);
+let BaseKeyHandle = BaseKeyHandle_1 = class BaseKeyHandle extends CryptoSerializable_1.CryptoSerializableAsync {
+    async encryptionAndHashAlgorithm() {
+        const spec = await this.keyHandle.spec();
+        return [
+            CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(spec.cipher),
+            CryptoLayerUtils_1.CryptoLayerUtils.cryptoHashAlgorithmFromCryptoHash(spec.signing_hash)
+        ];
     }
-    /** @see from */
-    static async fromJSON(value) {
-        return await this.fromAny(value);
+    async encryptionAlgorithm() {
+        const spec = await this.keyHandle.spec();
+        return CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(spec.cipher);
     }
-    /** @see from */
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
-    }
-    /**
-     * Creates a new {@link BaseKeyHandle} or its child from an existing {@link KeyHandle}.
-     */
-    static async fromProviderAndKeyHandle(provider, keyHandle) {
-        const result = new this();
-        [result.providerName, result.id, result.spec] = await Promise.all([
-            provider.providerName(),
-            keyHandle.id(),
-            keyHandle.spec()
-        ]);
-        result.provider = provider;
-        result.keyHandle = keyHandle;
-        return result;
+    async hashAlgorithm() {
+        const spec = await this.keyHandle.spec();
+        return CryptoLayerUtils_1.CryptoLayerUtils.cryptoHashAlgorithmFromCryptoHash(spec.signing_hash);
     }
     static preFrom(value) {
         if (value.kid) {
@@ -68,7 +53,13 @@ let BaseKeyHandle = class BaseKeyHandle extends CryptoSerializable_1.CryptoSeria
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.DeserializeValidation, "Expected 'BaseKeyHandle' in postFrom.");
         }
         const provider = (0, CryptoLayerProviders_1.getProvider)({ providerName: value.providerName });
-        const keyHandle = await provider.loadKey(value.id);
+        let keyHandle;
+        try {
+            keyHandle = await provider.loadKey(value.id);
+        }
+        catch (e) {
+            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.CalLoadKey, "Failed to load key during deserialization.", undefined, e, BaseKeyHandle_1.postFrom);
+        }
         value.keyHandle = keyHandle;
         value.provider = provider;
         return value;
@@ -85,35 +76,7 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], BaseKeyHandle.prototype, "providerName", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({
-        customValidator: (value) => {
-            if ((0, checks_1.isKeySpec)(value))
-                return undefined;
-            return "Is not of type KeySpec.";
-        }
-    }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", Object)
-], BaseKeyHandle.prototype, "spec", void 0);
-exports.BaseKeyHandle = BaseKeyHandle = __decorate([
+exports.BaseKeyHandle = BaseKeyHandle = BaseKeyHandle_1 = __decorate([
     (0, ts_serval_1.type)("BaseKeyHandle")
 ], BaseKeyHandle);
-class ImportableBaseKeyHandle extends BaseKeyHandle {
-    /**
-     * Creates a new {@link BaseKeyHandle} or its child by importing a raw key into a provider.
-     */
-    static async fromRawKey(providerIdent, rawKey, spec) {
-        const provider = (0, CryptoLayerProviders_1.getProvider)(providerIdent);
-        let keyHandle;
-        try {
-            keyHandle = await provider.importKey(spec, rawKey.buffer);
-        }
-        catch (e) {
-            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.CalImportOfKey, "Failed to import raw symmetric key.", undefined, e, ImportableBaseKeyHandle.fromRawKey);
-        }
-        return await this.fromProviderAndKeyHandle(provider, keyHandle);
-    }
-}
-exports.ImportableBaseKeyHandle = ImportableBaseKeyHandle;
 //# sourceMappingURL=BaseKeyHandle.js.map

package/dist/crypto-layer/encryption/BaseKeyHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/BaseKeyHandle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/BaseKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8G;AAE9G,mDAAgD;AAChD,2DAAwD;AACxD,iEAAmE;AAGnE,kEAAsD;AACtD,0DAAuD;AAYvD;;;;GAIG;AAEI,IAAe,aAAa,qBAA5B,MAAe,aAAc,SAAQ,4CAAuB;IAYxD,KAAK,CAAC,0BAA0B;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO;YACH,mCAAgB,CAAC,mCAAmC,CAAC,IAAI,CAAC,MAAM,CAAC;YACjE,mCAAgB,CAAC,iCAAiC,CAAC,IAAI,CAAC,YAAY,CAAC;SACxE,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,mBAAmB;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO,mCAAgB,CAAC,mCAAmC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,aAAa;QACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO,mCAAgB,CAAC,iCAAiC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjF,CAAC;IAES,MAAM,CAAU,OAAO,CAAC,KAAU;QACxC,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACZ,KAAK,GAAG;gBACJ,EAAE,EAAE,KAAK,CAAC,GAAG;gBACb,YAAY,EAAE,KAAK,CAAC,GAAG;gBACvB,IAAI,EAAE,KAAK,CAAC,GAAG;aAClB,CAAC;QACN,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAU,KAAK,CAAC,QAAQ,CAA8B,KAAQ;QACvE,IAAI,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,qBAAqB,EAAE,uCAAuC,CAAC,CAAC;QAC1G,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,kCAAW,EAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QACnE,IAAI,SAAoB,CAAC;QACzB,IAAI,CAAC;YACD,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,IAAI,yBAAW,CACjB,iCAAe,CAAC,UAAU,EAC1B,4CAA4C,EAC5C,SAAS,EACT,CAAU,EACV,eAAa,CAAC,QAAQ,CACzB,CAAC;QACN,CAAC;QAED,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC1B,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAjEqB,sCAAa;AAGxB;IAFN,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;yCACM;AAIX;IAFN,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;mDACgB;wBAPV,aAAa;IADlC,IAAA,gBAAI,EAAC,eAAe,CAAC;GACA,aAAa,CAiElC"}

package/dist/crypto-layer/encryption/CryptoEncryptionHandle.d.ts

@@ -1,23 +1,28 @@
-import { Provider } from "@nmshd/rs-crypto-types";
+import { KeyHandle, Provider } from "@nmshd/rs-crypto-types";
 import { CoreBuffer } from "../../CoreBuffer";
 import { CryptoCipher } from "../../encryption/CryptoCipher";
 import { CryptoEncryptionAlgorithm } from "../../encryption/CryptoEncryption";
 import { CryptoSecretKey } from "../../encryption/CryptoSecretKey";
 import { CryptoHashAlgorithm } from "../../hash/CryptoHash";
 import { ProviderIdentifier } from "../CryptoLayerProviders";
+import { BaseDerivedKeyHandle } from "./BaseDerivedKeyHandle";
 import { BaseKeyHandle } from "./BaseKeyHandle";
 import { DeviceBoundKeyHandle } from "./DeviceBoundKeyHandle";
 import { PortableDerivedKeyHandle } from "./PortableDerivedKeyHandle";
 import { PortableKeyHandle } from "./PortableKeyHandle";
 export declare class CryptoEncryptionHandle {
+    /**
+     * Creates a new {@link BaseKeyHandle} / {@link DerivedBaseKeyHandle} or its child from an existing {@link KeyHandle}.
+     */
+    static _keyHandleFromProviderAndCalKeyHandle<T extends BaseKeyHandle | BaseDerivedKeyHandle>(constructor: new () => T, provider: Provider, keyHandle: KeyHandle): Promise<T>;
     private static generateKeyHandle;
     static generateDeviceBoundKeyHandle(providerIdent: ProviderIdentifier, encryptionAlgorithm: CryptoEncryptionAlgorithm, hashAlgorithm: CryptoHashAlgorithm): Promise<DeviceBoundKeyHandle>;
     static generatePortableKeyHandle(providerIdent: ProviderIdentifier, encryptionAlgorithm: CryptoEncryptionAlgorithm, hashAlgorithm: CryptoHashAlgorithm): Promise<PortableKeyHandle>;
-    static encrypt<T extends BaseKeyHandle>(plaintext: CoreBuffer, secretKeyHandle: T, nonce?: CoreBuffer): Promise<CryptoCipher>;
-    static encryptWithCounter<T extends BaseKeyHandle>(plaintext: CoreBuffer, secretKeyHandle: T, nonce: CoreBuffer, counter: number): Promise<CryptoCipher>;
-    static decrypt<T extends BaseKeyHandle>(cipher: CryptoCipher, secretKeyHandle: T, nonce?: CoreBuffer): Promise<CoreBuffer>;
-    static decryptWithCounter<T extends BaseKeyHandle>(cipher: CryptoCipher, secretKeyHandle: T, nonce: CoreBuffer, counter: number): Promise<CoreBuffer>;
-    static createNonce(algorithm: CryptoEncryptionAlgorithm, provider: Provider): Promise<CoreBuffer>;
+    static encrypt<T extends BaseKeyHandle | BaseDerivedKeyHandle>(plaintext: CoreBuffer, secretKeyHandle: T, nonce?: CoreBuffer): Promise<CryptoCipher>;
+    static encryptWithCounter<T extends BaseKeyHandle | BaseDerivedKeyHandle>(plaintext: CoreBuffer, secretKeyHandle: T, nonce: CoreBuffer, counter: number): Promise<CryptoCipher>;
+    static decrypt<T extends BaseKeyHandle | BaseDerivedKeyHandle>(cipher: CryptoCipher, secretKeyHandle: T, nonce?: CoreBuffer): Promise<CoreBuffer>;
+    static decryptWithCounter<T extends BaseKeyHandle | BaseDerivedKeyHandle>(cipher: CryptoCipher, secretKeyHandle: T, nonce: CoreBuffer, counter: number): Promise<CoreBuffer>;
+    static createNonce(providerIdent: ProviderIdentifier, algorithm: CryptoEncryptionAlgorithm): Promise<CoreBuffer>;
     static extractRawKey(portableKeyHandle: PortableKeyHandle | PortableDerivedKeyHandle): Promise<CoreBuffer>;
     static cryptoSecretKeyFromPortableKeyHandle(portableKeyHandle: PortableKeyHandle | PortableDerivedKeyHandle): Promise<CryptoSecretKey>;
     private static keyHandleFromCryptoSecretKey;

package/dist/crypto-layer/encryption/CryptoEncryptionHandle.js

@@ -13,12 +13,20 @@ const DeviceBoundKeyHandle_1 = require("./DeviceBoundKeyHandle");
 const PortableDerivedKeyHandle_1 = require("./PortableDerivedKeyHandle");
 const PortableKeyHandle_1 = require("./PortableKeyHandle");
 class CryptoEncryptionHandle {
+    /**
+     * Creates a new {@link BaseKeyHandle} / {@link DerivedBaseKeyHandle} or its child from an existing {@link KeyHandle}.
+     */
+    static async _keyHandleFromProviderAndCalKeyHandle(constructor, provider, keyHandle) {
+        const result = new constructor();
+        [result.providerName, result.id] = await Promise.all([provider.providerName(), keyHandle.id()]);
+        result.provider = provider;
+        result.keyHandle = keyHandle;
+        return result;
+    }
     static async generateKeyHandle(constructor, providerIdent, spec) {
         const provider = (0, CryptoLayerProviders_1.getProvider)(providerIdent);
         const keyHandle = await provider.createKey(spec);
-        const secretKeyHandle = await constructor.fromProviderAndKeyHandle(provider, keyHandle, {
-            keySpec: spec
-        });
+        const secretKeyHandle = await CryptoEncryptionHandle._keyHandleFromProviderAndCalKeyHandle(constructor, provider, keyHandle);
         return secretKeyHandle;
     }
     static async generateDeviceBoundKeyHandle(providerIdent, encryptionAlgorithm, hashAlgorithm) {
@@ -40,9 +48,9 @@ class CryptoEncryptionHandle {
         return await this.generateKeyHandle(PortableKeyHandle_1.PortableKeyHandle, providerIdent, portableSpec);
     }
     static async encrypt(plaintext, secretKeyHandle, nonce) {
-        const encryptionAlgorithm = CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(secretKeyHandle.spec.cipher);
+        const encryptionAlgorithm = await secretKeyHandle.encryptionAlgorithm();
         if (nonce === undefined || nonce.buffer.length === 0) {
-            nonce = await this.createNonce(encryptionAlgorithm, secretKeyHandle.provider);
+            nonce = await this.createNonce({ providerName: secretKeyHandle.providerName }, encryptionAlgorithm);
         }
         else {
             CryptoValidation_1.CryptoValidation.checkNonceForAlgorithm(nonce, encryptionAlgorithm);
@@ -61,7 +69,7 @@ class CryptoEncryptionHandle {
         });
     }
     static async encryptWithCounter(plaintext, secretKeyHandle, nonce, counter) {
-        const encryptionAlgorithm = CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(secretKeyHandle.spec.cipher);
+        const encryptionAlgorithm = await secretKeyHandle.encryptionAlgorithm();
         CryptoValidation_1.CryptoValidation.checkCounter(counter);
         CryptoValidation_1.CryptoValidation.checkNonceForAlgorithm(nonce, encryptionAlgorithm);
         const publicNonce = this._addCounter(nonce.buffer, counter);
@@ -79,7 +87,7 @@ class CryptoEncryptionHandle {
         });
     }
     static async decrypt(cipher, secretKeyHandle, nonce) {
-        const encryptionAlgorithm = CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(secretKeyHandle.spec.cipher);
+        const encryptionAlgorithm = await secretKeyHandle.encryptionAlgorithm();
         let publicNonce;
         if (nonce !== undefined) {
             CryptoValidation_1.CryptoValidation.checkNonceForAlgorithm(nonce, encryptionAlgorithm);
@@ -100,7 +108,7 @@ class CryptoEncryptionHandle {
         }
     }
     static async decryptWithCounter(cipher, secretKeyHandle, nonce, counter) {
-        const encryptionAlgorithm = CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(secretKeyHandle.spec.cipher);
+        const encryptionAlgorithm = await secretKeyHandle.encryptionAlgorithm();
         CryptoValidation_1.CryptoValidation.checkCounter(counter);
         CryptoValidation_1.CryptoValidation.checkNonceForAlgorithm(nonce, encryptionAlgorithm);
         const publicNonce = this._addCounter(nonce.buffer, counter);
@@ -112,7 +120,8 @@ class CryptoEncryptionHandle {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionDecrypt, `${e}`, undefined, e, CryptoEncryptionHandle.decryptWithCounter);
         }
     }
-    static async createNonce(algorithm, provider) {
+    static async createNonce(providerIdent, algorithm) {
+        const provider = (0, CryptoLayerProviders_1.getProvider)(providerIdent);
         let nonceLength;
         switch (algorithm) {
             case 1 /* CryptoEncryptionAlgorithm.AES128_GCM */:
@@ -137,7 +146,7 @@ class CryptoEncryptionHandle {
     }
     static async cryptoSecretKeyFromPortableKeyHandle(portableKeyHandle) {
         const rawKeyPromise = CryptoEncryptionHandle.extractRawKey(portableKeyHandle);
-        const algorithm = CryptoLayerUtils_1.CryptoLayerUtils.cryptoEncryptionAlgorithmFromCipher(portableKeyHandle.spec.cipher);
+        const algorithm = await portableKeyHandle.encryptionAlgorithm();
         const cryptoSecretKeyObj = {
             algorithm: algorithm,
             secretKey: await rawKeyPromise
@@ -153,8 +162,14 @@ class CryptoEncryptionHandle {
             non_exportable: false
         };
         const provider = (0, CryptoLayerProviders_1.getProvider)(providerIdent);
-        const keyHandle = await provider.importKey(keySpec, cryptoSecretKey.secretKey.buffer);
-        return await constructor.fromProviderAndKeyHandle(provider, keyHandle);
+        let keyHandle;
+        try {
+            keyHandle = await provider.importKey(keySpec, cryptoSecretKey.secretKey.buffer);
+        }
+        catch (e) {
+            throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.CalImportOfKey, "Failed to import crypto secret key.", undefined, e, CryptoEncryptionHandle.keyHandleFromCryptoSecretKey);
+        }
+        return await CryptoEncryptionHandle._keyHandleFromProviderAndCalKeyHandle(constructor, provider, keyHandle);
     }
     static async portableKeyHandleFromCryptoSecretKey(providerIdent, cryptoSecretKey, signingHash = 2 /* CryptoHashAlgorithm.SHA512 */) {
         return await CryptoEncryptionHandle.keyHandleFromCryptoSecretKey(PortableKeyHandle_1.PortableKeyHandle, providerIdent, cryptoSecretKey, signingHash, false);

package/dist/crypto-layer/encryption/CryptoEncryptionHandle.js.map

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

package/dist/crypto-layer/encryption/DeviceBoundDerivedKeyHandle.d.ts

@@ -1,7 +1,5 @@
-import { BaseKeyHandle, IBaseKeyHandleSerialized } from "./BaseKeyHandle";
+import { BaseDerivedKeyHandle } from "./BaseDerivedKeyHandle";
 /** Non exportable, ephemeral key handle that is derived from a device bound key handle. */
-export declare class DeviceBoundDerivedKeyHandle extends BaseKeyHandle {
+export declare class DeviceBoundDerivedKeyHandle extends BaseDerivedKeyHandle {
     readonly _isDeviceBoundDerivedKeyHandle = true;
-    toJSON(verbose?: boolean): IBaseKeyHandleSerialized;
-    toBase64(verbose?: boolean): string;
 }

package/dist/crypto-layer/encryption/DeviceBoundDerivedKeyHandle.js

@@ -8,26 +8,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceBoundDerivedKeyHandle = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
-const CoreBuffer_1 = require("../../CoreBuffer");
-const BaseKeyHandle_1 = require("./BaseKeyHandle");
+const BaseDerivedKeyHandle_1 = require("./BaseDerivedKeyHandle");
 /** Non exportable, ephemeral key handle that is derived from a device bound key handle. */
-let DeviceBoundDerivedKeyHandle = class DeviceBoundDerivedKeyHandle extends BaseKeyHandle_1.BaseKeyHandle {
+let DeviceBoundDerivedKeyHandle = class DeviceBoundDerivedKeyHandle extends BaseDerivedKeyHandle_1.BaseDerivedKeyHandle {
     constructor() {
         super(...arguments);
         // Phantom marker to make this type incompatible to other types that extend `BaseKeyHandle`.
         this._isDeviceBoundDerivedKeyHandle = true;
     }
-    toJSON(verbose = true) {
-        return {
-            kid: this.id,
-            pnm: this.providerName,
-            spc: this.spec,
-            "@type": verbose ? "DeviceBoundDerivedKeyHandle" : undefined
-        };
-    }
-    toBase64(verbose = true) {
-        return CoreBuffer_1.CoreBuffer.utf8_base64(this.serialize(verbose));
-    }
 };
 exports.DeviceBoundDerivedKeyHandle = DeviceBoundDerivedKeyHandle;
 exports.DeviceBoundDerivedKeyHandle = DeviceBoundDerivedKeyHandle = __decorate([

package/dist/crypto-layer/encryption/DeviceBoundDerivedKeyHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceBoundDerivedKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/DeviceBoundDerivedKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iDAA8C;AAC9C,mDAA0E;AAE1E,2FAA2F;AAEpF,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,6BAAa;IAAvD;;QACH,4FAA4F;QAC5E,mCAA8B,GAAG,IAAI,CAAC;IAc1D,CAAC;IAZmB,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,GAAG,EAAE,IAAI,CAAC,YAAY;YACtB,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,SAAS;SAC/D,CAAC;IACN,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAhBY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,gBAAI,EAAC,6BAA6B,CAAC;GACvB,2BAA2B,CAgBvC"}
+{"version":3,"file":"DeviceBoundDerivedKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/DeviceBoundDerivedKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iEAA8D;AAE9D,2FAA2F;AAEpF,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,2CAAoB;IAA9D;;QACH,4FAA4F;QAC5E,mCAA8B,GAAG,IAAI,CAAC;IAC1D,CAAC;CAAA,CAAA;AAHY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,gBAAI,EAAC,6BAA6B,CAAC;GACvB,2BAA2B,CAGvC"}

package/dist/crypto-layer/encryption/DeviceBoundKeyHandle.d.ts

@@ -1,7 +1,18 @@
-import { BaseKeyHandle, IBaseKeyHandleSerialized } from "./BaseKeyHandle";
+import { CoreBuffer } from "../../CoreBuffer";
+import { BaseKeyHandle, IBaseKeyHandle, IBaseKeyHandleSerialized } from "./BaseKeyHandle";
 /** Key handle that is non exportable (the key cannot be extracted). */
 export declare class DeviceBoundKeyHandle extends BaseKeyHandle {
     readonly _isDeviceBoundKeyHandle = true;
     toJSON(verbose?: boolean): IBaseKeyHandleSerialized;
     toBase64(verbose?: boolean): string;
+    /**
+     * Deserializes an object representation of a {@link DeviceBoundKeyHandle}.
+     *
+     * This method is not able to import raw keys or {@link KeyHandle}.
+     */
+    static from(value: IBaseKeyHandle | CoreBuffer): Promise<DeviceBoundKeyHandle>;
+    /** @see from */
+    static fromJSON(value: IBaseKeyHandleSerialized): Promise<DeviceBoundKeyHandle>;
+    /** @see from */
+    static fromBase64(value: string): Promise<DeviceBoundKeyHandle>;
 }

package/dist/crypto-layer/encryption/DeviceBoundKeyHandle.js

@@ -21,13 +21,28 @@ let DeviceBoundKeyHandle = class DeviceBoundKeyHandle extends BaseKeyHandle_1.Ba
         return {
             kid: this.id,
             pnm: this.providerName,
-            spc: this.spec,
             "@type": verbose ? "DeviceBoundKeyHandle" : undefined
         };
     }
     toBase64(verbose = true) {
         return CoreBuffer_1.CoreBuffer.utf8_base64(this.serialize(verbose));
     }
+    /**
+     * Deserializes an object representation of a {@link DeviceBoundKeyHandle}.
+     *
+     * This method is not able to import raw keys or {@link KeyHandle}.
+     */
+    static async from(value) {
+        return await this.fromAny(value);
+    }
+    /** @see from */
+    static async fromJSON(value) {
+        return await this.fromAny(value);
+    }
+    /** @see from */
+    static async fromBase64(value) {
+        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    }
 };
 exports.DeviceBoundKeyHandle = DeviceBoundKeyHandle;
 exports.DeviceBoundKeyHandle = DeviceBoundKeyHandle = __decorate([

package/dist/crypto-layer/encryption/DeviceBoundKeyHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceBoundKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/DeviceBoundKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iDAA8C;AAC9C,mDAA0E;AAE1E,uEAAuE;AAEhE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,6BAAa;IAAhD;;QACH,4FAA4F;QAC5E,4BAAuB,GAAG,IAAI,CAAC;IAcnD,CAAC;IAZmB,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,GAAG,EAAE,IAAI,CAAC,YAAY;YACtB,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC;IACN,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAhBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAgBhC"}
+{"version":3,"file":"DeviceBoundKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/DeviceBoundKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iDAA8C;AAC9C,mDAA0F;AAE1F,uEAAuE;AAEhE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,6BAAa;IAAhD;;QACH,4FAA4F;QAC5E,4BAAuB,GAAG,IAAI,CAAC;IAgCnD,CAAC;IA9BmB,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,GAAG,EAAE,IAAI,CAAC,YAAY;YACtB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC;IACN,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAkC;QACvD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAA+B;QACxD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAa;QACxC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;CACJ,CAAA;AAlCY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAkChC"}

package/dist/crypto-layer/encryption/PortableDerivedKeyHandle.d.ts

@@ -1,6 +1,4 @@
-import { BaseKeyHandle, IBaseKeyHandleSerialized } from "./BaseKeyHandle";
-export declare class PortableDerivedKeyHandle extends BaseKeyHandle {
+import { BaseDerivedKeyHandle } from "./BaseDerivedKeyHandle";
+export declare class PortableDerivedKeyHandle extends BaseDerivedKeyHandle {
     readonly _isPortableDeriveKeyHandle = true;
-    toJSON(verbose?: boolean): IBaseKeyHandleSerialized;
-    toBase64(verbose?: boolean): string;
 }

package/dist/crypto-layer/encryption/PortableDerivedKeyHandle.js

@@ -8,25 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PortableDerivedKeyHandle = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
-const CoreBuffer_1 = require("../../CoreBuffer");
-const BaseKeyHandle_1 = require("./BaseKeyHandle");
-let PortableDerivedKeyHandle = class PortableDerivedKeyHandle extends BaseKeyHandle_1.BaseKeyHandle {
+const BaseDerivedKeyHandle_1 = require("./BaseDerivedKeyHandle");
+let PortableDerivedKeyHandle = class PortableDerivedKeyHandle extends BaseDerivedKeyHandle_1.BaseDerivedKeyHandle {
     constructor() {
         super(...arguments);
         // Phantom marker to make this type incompatible to other types that extend `BaseKeyHandle`.
         this._isPortableDeriveKeyHandle = true;
     }
-    toJSON(verbose = true) {
-        return {
-            kid: this.id,
-            pnm: this.providerName,
-            spc: this.spec,
-            "@type": verbose ? "PortableDerivedKeyHandle" : undefined
-        };
-    }
-    toBase64(verbose = true) {
-        return CoreBuffer_1.CoreBuffer.utf8_base64(this.serialize(verbose));
-    }
 };
 exports.PortableDerivedKeyHandle = PortableDerivedKeyHandle;
 exports.PortableDerivedKeyHandle = PortableDerivedKeyHandle = __decorate([

package/dist/crypto-layer/encryption/PortableDerivedKeyHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"PortableDerivedKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/PortableDerivedKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iDAA8C;AAC9C,mDAA0E;AAGnE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAAa;IAApD;;QACH,4FAA4F;QAC5E,+BAA0B,GAAG,IAAI,CAAC;IActD,CAAC;IAZmB,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,GAAG,EAAE,IAAI,CAAC,YAAY;YACtB,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS;SAC5D,CAAC;IACN,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAhBY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,gBAAI,EAAC,0BAA0B,CAAC;GACpB,wBAAwB,CAgBpC"}
+{"version":3,"file":"PortableDerivedKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/PortableDerivedKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iEAA8D;AAGvD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,2CAAoB;IAA3D;;QACH,4FAA4F;QAC5E,+BAA0B,GAAG,IAAI,CAAC;IACtD,CAAC;CAAA,CAAA;AAHY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,gBAAI,EAAC,0BAA0B,CAAC;GACpB,wBAAwB,CAGpC"}

package/dist/crypto-layer/encryption/PortableKeyHandle.d.ts

@@ -1,7 +1,18 @@
-import { IBaseKeyHandleSerialized, ImportableBaseKeyHandle } from "./BaseKeyHandle";
+import { CoreBuffer } from "../../CoreBuffer";
+import { BaseKeyHandle, IBaseKeyHandleSerialized } from "./BaseKeyHandle";
 /** Key handle that is exportable and can also be created by importing a key. */
-export declare class PortableKeyHandle extends ImportableBaseKeyHandle {
+export declare class PortableKeyHandle extends BaseKeyHandle {
     readonly _isPortableKeyHandle = true;
     toJSON(verbose?: boolean): IBaseKeyHandleSerialized;
     toBase64(verbose?: boolean): string;
+    /**
+     * Deserializes an object representation of a {@link PortableKeyHandle}.
+     *
+     * This method is not able to import raw keys or {@link KeyHandle}.
+     */
+    static from(value: IBaseKeyHandleSerialized | CoreBuffer): Promise<PortableKeyHandle>;
+    /** @see from */
+    static fromJSON(value: IBaseKeyHandleSerialized): Promise<PortableKeyHandle>;
+    /** @see from */
+    static fromBase64(value: string): Promise<PortableKeyHandle>;
 }

package/dist/crypto-layer/encryption/PortableKeyHandle.js

@@ -11,7 +11,7 @@ const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../../CoreBuffer");
 const BaseKeyHandle_1 = require("./BaseKeyHandle");
 /** Key handle that is exportable and can also be created by importing a key. */
-let PortableKeyHandle = class PortableKeyHandle extends BaseKeyHandle_1.ImportableBaseKeyHandle {
+let PortableKeyHandle = class PortableKeyHandle extends BaseKeyHandle_1.BaseKeyHandle {
     constructor() {
         super(...arguments);
         // Phantom marker to make this type incompatible to other types that extend `BaseKeyHandle`.
@@ -21,13 +21,28 @@ let PortableKeyHandle = class PortableKeyHandle extends BaseKeyHandle_1.Importab
         return {
             kid: this.id,
             pnm: this.providerName,
-            spc: this.spec,
             "@type": verbose ? "PortableKeyHandle" : undefined
         };
     }
     toBase64(verbose = true) {
         return CoreBuffer_1.CoreBuffer.utf8_base64(this.serialize(verbose));
     }
+    /**
+     * Deserializes an object representation of a {@link PortableKeyHandle}.
+     *
+     * This method is not able to import raw keys or {@link KeyHandle}.
+     */
+    static async from(value) {
+        return await this.fromAny(value);
+    }
+    /** @see from */
+    static async fromJSON(value) {
+        return await this.fromAny(value);
+    }
+    /** @see from */
+    static async fromBase64(value) {
+        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    }
 };
 exports.PortableKeyHandle = PortableKeyHandle;
 exports.PortableKeyHandle = PortableKeyHandle = __decorate([

package/dist/crypto-layer/encryption/PortableKeyHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"PortableKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/PortableKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iDAA8C;AAC9C,mDAAoF;AAEpF,gFAAgF;AAEzE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,uCAAuB;IAAvD;;QACH,4FAA4F;QAC5E,yBAAoB,GAAG,IAAI,CAAC;IAchD,CAAC;IAZmB,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,GAAG,EAAE,IAAI,CAAC,YAAY;YACtB,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS;SACrD,CAAC;IACN,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAhBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,gBAAI,EAAC,mBAAmB,CAAC;GACb,iBAAiB,CAgB7B"}
+{"version":3,"file":"PortableKeyHandle.js","sourceRoot":"","sources":["../../../src/crypto-layer/encryption/PortableKeyHandle.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA0C;AAC1C,iDAA8C;AAC9C,mDAA0E;AAE1E,gFAAgF;AAEzE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,6BAAa;IAA7C;;QACH,4FAA4F;QAC5E,yBAAoB,GAAG,IAAI,CAAC;IAgChD,CAAC;IA9BmB,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,GAAG,EAAE,IAAI,CAAC,YAAY;YACtB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS;SACrD,CAAC;IACN,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAA4C;QACjE,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAA+B;QACxD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAa;QACxC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;CACJ,CAAA;AAlCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,gBAAI,EAAC,mBAAmB,CAAC;GACb,iBAAiB,CAkC7B"}

package/dist/crypto-layer/index.d.ts

@@ -2,6 +2,7 @@ export * from "./CryptoDerivationHandle";
 export * from "./CryptoLayerConfig";
 export * from "./CryptoLayerProviders";
 export * from "./CryptoLayerUtils";
+export * from "./encryption/BaseDerivedKeyHandle";
 export * from "./encryption/BaseKeyHandle";
 export * from "./encryption/CryptoEncryptionHandle";
 export * from "./encryption/DeviceBoundDerivedKeyHandle";

package/dist/crypto-layer/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./CryptoDerivationHandle"), exports);
 __exportStar(require("./CryptoLayerConfig"), exports);
 __exportStar(require("./CryptoLayerProviders"), exports);
 __exportStar(require("./CryptoLayerUtils"), exports);
+__exportStar(require("./encryption/BaseDerivedKeyHandle"), exports);
 __exportStar(require("./encryption/BaseKeyHandle"), exports);
 __exportStar(require("./encryption/CryptoEncryptionHandle"), exports);
 __exportStar(require("./encryption/DeviceBoundDerivedKeyHandle"), exports);

package/dist/crypto-layer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/crypto-layer/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,sDAAoC;AACpC,yDAAuC;AACvC,qDAAmC;AACnC,6DAA2C;AAC3C,sEAAoD;AACpD,2EAAyD;AACzD,oEAAkD;AAClD,wEAAsD;AACtD,iEAA+C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/crypto-layer/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,sDAAoC;AACpC,yDAAuC;AACvC,qDAAmC;AACnC,oEAAkD;AAClD,6DAA2C;AAC3C,sEAAoD;AACpD,2EAAyD;AACzD,oEAAkD;AAClD,wEAAsD;AACtD,iEAA+C"}

package/package.json

@@ -61,5 +61,5 @@
         "access": "public",
         "provenance": true
     },
-    "version": "2.2.0-alpha.1"
+    "version": "2.2.0-alpha.2"
 }