@nmshd/crypto 2.0.7 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/CryptoDerivation.d.ts +4 -3
- package/dist/CryptoDerivation.js +33 -7
- package/dist/CryptoDerivation.js.map +1 -1
- package/dist/CryptoValidation.d.ts +2 -2
- package/dist/CryptoValidation.js +5 -5
- package/dist/CryptoValidation.js.map +1 -1
- package/dist/buildInformation.js +4 -4
- package/dist/exchange/CryptoExchangeValidation.d.ts +4 -4
- package/dist/exchange/CryptoExchangeValidation.js +4 -4
- package/dist/exchange/CryptoExchangeValidation.js.map +1 -1
- package/dist/signature/CryptoSignatureValidation.d.ts +2 -2
- package/dist/signature/CryptoSignatureValidation.js +2 -2
- package/dist/signature/CryptoSignatureValidation.js.map +1 -1
- package/lib-web/nmshd.crypto.js +48 -22
- package/lib-web/nmshd.crypto.js.map +1 -1
- package/lib-web/nmshd.crypto.min.js +1 -1
- package/lib-web/nmshd.crypto.min.js.map +1 -1
- package/package.json +7 -6
|
@@ -5,16 +5,17 @@ import { CryptoSecretKey } from "./encryption/CryptoSecretKey";
|
|
|
5
5
|
* The key derivation algorithm to use
|
|
6
6
|
*/
|
|
7
7
|
export declare const enum CryptoDerivationAlgorithm {
|
|
8
|
-
|
|
8
|
+
ARGON2I = "argon2i",
|
|
9
|
+
ARGON2ID = "argon2id"
|
|
9
10
|
}
|
|
10
11
|
export interface ICryptoDerivation {
|
|
11
12
|
}
|
|
12
13
|
export interface ICryptoDerivationStatic {
|
|
13
14
|
new (): ICryptoDerivation;
|
|
14
|
-
|
|
15
|
+
deriveKeyFromPassword(masterKey: ICoreBuffer, salt: ICoreBuffer, keyAlgorithm: CryptoEncryptionAlgorithm, derivationAlgorithm: CryptoDerivationAlgorithm, iterations: number, memlimit: number): Promise<CryptoSecretKey>;
|
|
15
16
|
deriveKeyFromBase(baseKey: ICoreBuffer, keyId: number, context: string, keyAlgorithm: CryptoEncryptionAlgorithm): Promise<CryptoSecretKey>;
|
|
16
17
|
}
|
|
17
18
|
export declare class CryptoDerivation implements ICryptoDerivation {
|
|
18
|
-
static
|
|
19
|
+
static deriveKeyFromPassword(password: ICoreBuffer, salt: ICoreBuffer, keyAlgorithm?: CryptoEncryptionAlgorithm, derivationAlgorithm?: CryptoDerivationAlgorithm, opslimit?: number, memlimit?: number): Promise<CryptoSecretKey>;
|
|
19
20
|
static deriveKeyFromBase(baseKey: ICoreBuffer, keyId: number, context: string, keyAlgorithm?: CryptoEncryptionAlgorithm): Promise<CryptoSecretKey>;
|
|
20
21
|
}
|
package/dist/CryptoDerivation.js
CHANGED
|
@@ -5,22 +5,48 @@ const CoreBuffer_1 = require("./CoreBuffer");
|
|
|
5
5
|
const CryptoSecretKey_1 = require("./encryption/CryptoSecretKey");
|
|
6
6
|
const SodiumWrapper_1 = require("./SodiumWrapper");
|
|
7
7
|
class CryptoDerivation {
|
|
8
|
-
static async
|
|
8
|
+
static async deriveKeyFromPassword(password, salt, keyAlgorithm = 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */, derivationAlgorithm = "argon2id" /* CryptoDerivationAlgorithm.ARGON2ID */, opslimit = 100000, memlimit = 8192) {
|
|
9
|
+
const sodium = (await SodiumWrapper_1.SodiumWrapper.ready());
|
|
10
|
+
if (salt.buffer.byteLength !== sodium.crypto_pwhash_SALTBYTES) {
|
|
11
|
+
throw new Error(`The salt must be exactly ${sodium.crypto_pwhash_SALTBYTES} bytes long!`);
|
|
12
|
+
}
|
|
13
|
+
if (opslimit < sodium.crypto_pwhash_OPSLIMIT_MIN) {
|
|
14
|
+
throw new Error(`The opslimit must be higher than ${sodium.crypto_pwhash_OPSLIMIT_MIN}.`);
|
|
15
|
+
}
|
|
16
|
+
if (sodium.crypto_pwhash_OPSLIMIT_MAX > 0 && opslimit > sodium.crypto_pwhash_OPSLIMIT_MAX) {
|
|
17
|
+
throw new Error(`The opslimit must be lower than ${sodium.crypto_pwhash_OPSLIMIT_MAX}.`);
|
|
18
|
+
}
|
|
19
|
+
if (memlimit < sodium.crypto_pwhash_MEMLIMIT_MIN) {
|
|
20
|
+
throw new Error(`The memlimit must be higher than ${sodium.crypto_pwhash_MEMLIMIT_MIN}.`);
|
|
21
|
+
}
|
|
22
|
+
if (sodium.crypto_pwhash_MEMLIMIT_MAX > 0 && memlimit > sodium.crypto_pwhash_MEMLIMIT_MAX) {
|
|
23
|
+
throw new Error(`The memlimit must be lower than ${sodium.crypto_pwhash_MEMLIMIT_MAX}.`);
|
|
24
|
+
}
|
|
25
|
+
let keyLength;
|
|
9
26
|
switch (keyAlgorithm) {
|
|
10
27
|
case 1 /* CryptoEncryptionAlgorithm.AES128_GCM */:
|
|
28
|
+
keyLength = 16;
|
|
29
|
+
break;
|
|
11
30
|
case 2 /* CryptoEncryptionAlgorithm.AES256_GCM */:
|
|
12
31
|
case 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */:
|
|
32
|
+
keyLength = 32;
|
|
13
33
|
break;
|
|
14
34
|
default:
|
|
15
35
|
throw new Error("KeyAlgorithm not supported.");
|
|
16
36
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
37
|
+
let derivationAlgorithmAsNumber;
|
|
38
|
+
switch (derivationAlgorithm) {
|
|
39
|
+
case "argon2i" /* CryptoDerivationAlgorithm.ARGON2I */:
|
|
40
|
+
derivationAlgorithmAsNumber = 1;
|
|
41
|
+
break;
|
|
42
|
+
case "argon2id" /* CryptoDerivationAlgorithm.ARGON2ID */:
|
|
43
|
+
derivationAlgorithmAsNumber = 2;
|
|
44
|
+
break;
|
|
45
|
+
default:
|
|
46
|
+
throw new Error("DerivationAlgorithm not supported.");
|
|
20
47
|
}
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
const hashBuffer = CoreBuffer_1.CoreBuffer.fromString(pwhash, CoreBuffer_1.Encoding.Hex);
|
|
48
|
+
const pwhash = (await SodiumWrapper_1.SodiumWrapper.ready()).crypto_pwhash(keyLength, password.buffer, salt.buffer, opslimit, memlimit, derivationAlgorithmAsNumber);
|
|
49
|
+
const hashBuffer = CoreBuffer_1.CoreBuffer.from(pwhash);
|
|
24
50
|
return CryptoSecretKey_1.CryptoSecretKey.from({ secretKey: hashBuffer, algorithm: keyAlgorithm });
|
|
25
51
|
}
|
|
26
52
|
static async deriveKeyFromBase(baseKey, keyId, context, keyAlgorithm = 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CryptoDerivation.js","sourceRoot":"","sources":["../src/CryptoDerivation.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"CryptoDerivation.js","sourceRoot":"","sources":["../src/CryptoDerivation.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,8 @@ export declare class CryptoValidation {
|
|
|
12
12
|
static checkId(id: string, minLength?: number, maxLength?: number, throwError?: boolean): CryptoError | undefined;
|
|
13
13
|
static checkSerializedSecretKeyForAlgorithm(key: string, algorithm: CryptoEncryptionAlgorithm, throwError?: boolean): CryptoError | undefined;
|
|
14
14
|
static checkSecretKeyForAlgorithm(key?: CoreBuffer | string, algorithm?: CryptoEncryptionAlgorithm, throwError?: boolean): CryptoError | undefined;
|
|
15
|
-
static checkNonceAsString(nonce: string,
|
|
16
|
-
static checkNonceAsBuffer(nonce: CoreBuffer,
|
|
15
|
+
static checkNonceAsString(nonce: string, _algorithm: CryptoEncryptionAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
16
|
+
static checkNonceAsBuffer(nonce: CoreBuffer, _algorithm: CryptoEncryptionAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
17
17
|
static checkNonce(nonce: string | CoreBuffer, algorithm: CryptoEncryptionAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
18
18
|
static checkNonceForAlgorithm(nonce: CoreBuffer, algorithm: CryptoEncryptionAlgorithm, throwError?: boolean): CryptoError | undefined;
|
|
19
19
|
static checkCounter(counter?: number, throwError?: boolean): CryptoError | undefined;
|
package/dist/CryptoValidation.js
CHANGED
|
@@ -32,14 +32,14 @@ class CryptoValidation {
|
|
|
32
32
|
let error;
|
|
33
33
|
if (buffer instanceof CoreBuffer_1.CoreBuffer) {
|
|
34
34
|
if (buffer.buffer.byteLength < minBytes) {
|
|
35
|
-
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer has a minimum of ${minBytes} bytes.`);
|
|
35
|
+
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer within property ${propertyName} has a minimum of ${minBytes} bytes.`);
|
|
36
36
|
}
|
|
37
37
|
else if (buffer.buffer.byteLength > maxBytes) {
|
|
38
|
-
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer has a maximum of ${maxBytes} bytes.`);
|
|
38
|
+
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer within property ${propertyName} has a maximum of ${maxBytes} bytes.`);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
|
-
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer,
|
|
42
|
+
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer within property ${propertyName} must be of instance CoreBuffer.`);
|
|
43
43
|
}
|
|
44
44
|
if (error && throwError)
|
|
45
45
|
throw error;
|
|
@@ -185,10 +185,10 @@ class CryptoValidation {
|
|
|
185
185
|
throw error;
|
|
186
186
|
return error;
|
|
187
187
|
}
|
|
188
|
-
static checkNonceAsString(nonce,
|
|
188
|
+
static checkNonceAsString(nonce, _algorithm, propertyName = "nonce", throwError = true) {
|
|
189
189
|
return this.checkSerializedBuffer(nonce, 12, 24, propertyName, throwError);
|
|
190
190
|
}
|
|
191
|
-
static checkNonceAsBuffer(nonce,
|
|
191
|
+
static checkNonceAsBuffer(nonce, _algorithm, propertyName = "nonce", throwError = true) {
|
|
192
192
|
return this.checkBuffer(nonce, 12, 24, propertyName, throwError);
|
|
193
193
|
}
|
|
194
194
|
static checkNonce(nonce, algorithm, propertyName = "nonce", throwError = true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CryptoValidation.js","sourceRoot":"","sources":["../src/CryptoValidation.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,+CAA4C;AAC5C,uDAAoD;AAGpD,6DAA0D;AAE1D,MAAa,gBAAgB;IAClB,MAAM,CAAC,WAAW,CAAC,KAAU,EAAE,YAAqB,EAAE,UAAU,GAAG,IAAI;QAC1E,IAAI,KAAK,CAAC;QACV,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC;YACZ,IAAI,YAAY,EAAE,CAAC;gBACf,OAAO,GAAG,YAAY,YAAY,qBAAqB,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,8BAA8B,CAAC;YAC7C,CAAC;YACD,KAAK,GAAG,IAAI,yBAAW,CAAC,iCAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,KAAK,IAAI,UAAU;YAAE,MAAM,KAAK,CAAC;QACrC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,2BAA2B,CACrC,MAA2B,EAC3B,QAAQ,GAAG,CAAC,EACZ,WAAmB,MAAM,CAAC,gBAAgB,EAC1C,YAAqB,EACrB,UAAU,GAAG,IAAI;QAEjB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAC5F,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAClF,CAAC;IAEM,MAAM,CAAC,WAAW,CACrB,MAAkB,EAClB,QAAQ,GAAG,CAAC,EACZ,WAAmB,MAAM,CAAC,gBAAgB,EAC1C,YAAqB,EACrB,UAAU,GAAG,IAAI;QAEjB,IAAI,KAAK,CAAC;QACV,IAAI,MAAM,YAAY,uBAAU,EAAE,CAAC;YAC/B,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,EAAE,CAAC;gBACtC,KAAK,GAAG,IAAI,yBAAW,
|
|
1
|
+
{"version":3,"file":"CryptoValidation.js","sourceRoot":"","sources":["../src/CryptoValidation.ts"],"names":[],"mappings":"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"}
|
package/dist/buildInformation.js
CHANGED
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildInformation = void 0;
|
|
4
4
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
5
5
|
exports.buildInformation = {
|
|
6
|
-
version: "2.0
|
|
7
|
-
build: "
|
|
8
|
-
date: "2024-
|
|
9
|
-
commit: "
|
|
6
|
+
version: "2.1.0",
|
|
7
|
+
build: "28",
|
|
8
|
+
date: "2024-10-22T15:51:22+00:00",
|
|
9
|
+
commit: "8bfa3227909fac9c467a0d7dd5e2bd7e497cf9d1",
|
|
10
10
|
dependencies: {"libsodium-wrappers-sumo":"0.7.15","uuid":"10.0.0"},
|
|
11
11
|
libraries: {
|
|
12
12
|
serval: ts_serval_1.buildInformation
|
|
@@ -8,10 +8,10 @@ export declare class CryptoExchangeValidation extends CryptoValidation {
|
|
|
8
8
|
static readonly PUBLIC_KEY_MIN_BYTES = 20;
|
|
9
9
|
static readonly PUBLIC_KEY_MAX_BYTES = 40;
|
|
10
10
|
static checkExchangeAlgorithm(algorithm: number, throwError?: boolean): CryptoError | undefined;
|
|
11
|
-
static checkExchangePrivateKeyAsString(privateKey: string,
|
|
12
|
-
static checkExchangePrivateKeyAsBuffer(privateKey: CoreBuffer,
|
|
11
|
+
static checkExchangePrivateKeyAsString(privateKey: string, _algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
12
|
+
static checkExchangePrivateKeyAsBuffer(privateKey: CoreBuffer, _algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
13
13
|
static checkExchangePrivateKey(privateKey: string | CoreBuffer, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
14
|
-
static checkExchangePublicKeyAsString(publicKey: string,
|
|
15
|
-
static checkExchangePublicKeyAsBuffer(publicKey: CoreBuffer,
|
|
14
|
+
static checkExchangePublicKeyAsString(publicKey: string, _algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
15
|
+
static checkExchangePublicKeyAsBuffer(publicKey: CoreBuffer, _algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
16
16
|
static checkExchangePublicKey(publicKey: string | CoreBuffer, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
17
17
|
}
|
|
@@ -20,10 +20,10 @@ class CryptoExchangeValidation extends CryptoValidation_1.CryptoValidation {
|
|
|
20
20
|
throw error;
|
|
21
21
|
return error;
|
|
22
22
|
}
|
|
23
|
-
static checkExchangePrivateKeyAsString(privateKey,
|
|
23
|
+
static checkExchangePrivateKeyAsString(privateKey, _algorithm, propertyName = "privateKey", throwError = true) {
|
|
24
24
|
return super.checkSerializedBuffer(privateKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
25
25
|
}
|
|
26
|
-
static checkExchangePrivateKeyAsBuffer(privateKey,
|
|
26
|
+
static checkExchangePrivateKeyAsBuffer(privateKey, _algorithm, propertyName = "privateKey", throwError = true) {
|
|
27
27
|
return super.checkBuffer(privateKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
28
28
|
}
|
|
29
29
|
static checkExchangePrivateKey(privateKey, algorithm, propertyName = "privateKey", throwError = true) {
|
|
@@ -32,10 +32,10 @@ class CryptoExchangeValidation extends CryptoValidation_1.CryptoValidation {
|
|
|
32
32
|
}
|
|
33
33
|
return this.checkExchangePrivateKeyAsBuffer(privateKey, algorithm, propertyName, throwError);
|
|
34
34
|
}
|
|
35
|
-
static checkExchangePublicKeyAsString(publicKey,
|
|
35
|
+
static checkExchangePublicKeyAsString(publicKey, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
36
36
|
return super.checkSerializedBuffer(publicKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
37
37
|
}
|
|
38
|
-
static checkExchangePublicKeyAsBuffer(publicKey,
|
|
38
|
+
static checkExchangePublicKeyAsBuffer(publicKey, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
39
39
|
return super.checkBuffer(publicKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
40
40
|
}
|
|
41
41
|
static checkExchangePublicKey(publicKey, algorithm, propertyName = "publicKey", throwError = true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CryptoExchangeValidation.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeValidation.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAC7C,wDAAqD;AACrD,0DAAuD;AAGvD,MAAa,wBAAyB,SAAQ,mCAAgB;IAMnD,MAAM,CAAC,sBAAsB,CAAC,SAAiB,EAAE,UAAU,GAAG,IAAI;QACrE,IAAI,KAAK,CAAC;QACV,QAAQ,SAAS,EAAE,CAAC;YAChB,+CAAuC;YACvC,+CAAuC;YACvC;gBACI,MAAM;YACV;gBACI,KAAK,GAAG,IAAI,yBAAW,CACnB,iCAAe,CAAC,sBAAsB,EACtC,6CAA6C,CAChD,CAAC;gBACF,MAAM;QACd,CAAC;QACD,IAAI,KAAK,IAAI,UAAU;YAAE,MAAM,KAAK,CAAC;QACrC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,+BAA+B,CACzC,UAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"CryptoExchangeValidation.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeValidation.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAC7C,wDAAqD;AACrD,0DAAuD;AAGvD,MAAa,wBAAyB,SAAQ,mCAAgB;IAMnD,MAAM,CAAC,sBAAsB,CAAC,SAAiB,EAAE,UAAU,GAAG,IAAI;QACrE,IAAI,KAAK,CAAC;QACV,QAAQ,SAAS,EAAE,CAAC;YAChB,+CAAuC;YACvC,+CAAuC;YACvC;gBACI,MAAM;YACV;gBACI,KAAK,GAAG,IAAI,yBAAW,CACnB,iCAAe,CAAC,sBAAsB,EACtC,6CAA6C,CAChD,CAAC;gBACF,MAAM;QACd,CAAC;QACD,IAAI,KAAK,IAAI,UAAU;YAAE,MAAM,KAAK,CAAC;QACrC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,+BAA+B,CACzC,UAAkB,EAClB,UAAmC,EACnC,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,qBAAqB,CAC9B,UAAU,EACV,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,+BAA+B,CACzC,UAAsB,EACtB,UAAmC,EACnC,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,WAAW,CACpB,UAAU,EACV,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,uBAAuB,CACjC,UAA+B,EAC/B,SAAkC,EAClC,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,+BAA+B,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QACjG,CAAC;QAED,OAAO,IAAI,CAAC,+BAA+B,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IACjG,CAAC;IAEM,MAAM,CAAC,8BAA8B,CACxC,SAAiB,EACjB,UAAmC,EACnC,YAAY,GAAG,WAAW,EAC1B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,qBAAqB,CAC9B,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,8BAA8B,CACxC,SAAqB,EACrB,UAAmC,EACnC,YAAY,GAAG,WAAW,EAC1B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,WAAW,CACpB,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAChC,SAA8B,EAC9B,SAAkC,EAClC,YAAY,GAAG,WAAW,EAC1B,UAAU,GAAG,IAAI;QAEjB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAC/F,CAAC;QAED,OAAO,IAAI,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAC/F,CAAC;;AA5GL,4DA6GC;AA5G0B,8CAAqB,GAAG,EAAE,CAAC;AAC3B,8CAAqB,GAAG,EAAE,CAAC;AAC3B,6CAAoB,GAAG,EAAE,CAAC;AAC1B,6CAAoB,GAAG,EAAE,CAAC"}
|
|
@@ -13,8 +13,8 @@ export declare class CryptoSignatureValidation extends CryptoValidation {
|
|
|
13
13
|
static checkSignaturePrivateKeyAsString(key: string, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
14
14
|
static checkSignaturePrivateKeyAsBuffer(buffer: CoreBuffer, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
15
15
|
static checkSignaturePrivateKey(privateKey: string | CoreBuffer, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
16
|
-
static checkSignaturePublicKeyAsString(key: string,
|
|
17
|
-
static checkSignaturePublicKeyAsBuffer(buffer: CoreBuffer,
|
|
16
|
+
static checkSignaturePublicKeyAsString(key: string, _algorithm: CryptoSignatureAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
17
|
+
static checkSignaturePublicKeyAsBuffer(buffer: CoreBuffer, _algorithm: CryptoSignatureAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
18
18
|
static checkSignaturePublicKey(publicKey: string | CoreBuffer, algorithm: CryptoSignatureAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
|
|
19
19
|
static checkSignatureAsString(signature: string, throwError?: boolean): CryptoError | undefined;
|
|
20
20
|
static checkSignatureAsBuffer(signature: CoreBuffer, throwError?: boolean): CryptoError | undefined;
|
|
@@ -32,10 +32,10 @@ class CryptoSignatureValidation extends CryptoValidation_1.CryptoValidation {
|
|
|
32
32
|
}
|
|
33
33
|
return this.checkSignaturePrivateKeyAsBuffer(privateKey, propertyName, throwError);
|
|
34
34
|
}
|
|
35
|
-
static checkSignaturePublicKeyAsString(key,
|
|
35
|
+
static checkSignaturePublicKeyAsString(key, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
36
36
|
return super.checkSerializedBuffer(key, this.PUBLIC_KEY_MIN_BYTES, this.PUBLIC_KEY_MAX_BYTES, propertyName, throwError);
|
|
37
37
|
}
|
|
38
|
-
static checkSignaturePublicKeyAsBuffer(buffer,
|
|
38
|
+
static checkSignaturePublicKeyAsBuffer(buffer, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
39
39
|
return super.checkBuffer(buffer, this.PUBLIC_KEY_MIN_BYTES, this.PUBLIC_KEY_MAX_BYTES, propertyName, throwError);
|
|
40
40
|
}
|
|
41
41
|
static checkSignaturePublicKey(publicKey, algorithm, propertyName = "publicKey", throwError = true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CryptoSignatureValidation.js","sourceRoot":"","sources":["../../src/signature/CryptoSignatureValidation.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAC7C,wDAAqD;AACrD,0DAAuD;AAGvD,MAAa,yBAA0B,SAAQ,mCAAgB;IAQpD,MAAM,CAAC,uBAAuB,CAAC,SAAiB,EAAE,UAAU,GAAG,IAAI;QACtE,IAAI,KAA8B,CAAC;QACnC,QAAQ,SAAS,EAAE,CAAC;YAChB,oDAA4C;YAC5C,iDAAyC;YACzC;gBACI,MAAM;YACV;gBACI,KAAK,GAAG,IAAI,yBAAW,CACnB,iCAAe,CAAC,uBAAuB,EACvC,8CAA8C,CACjD,CAAC;gBACF,MAAM;QACd,CAAC;QACD,IAAI,UAAU,IAAI,KAAK;YAAE,MAAM,KAAK,CAAC;QACrC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,gCAAgC,CAC1C,GAAW,EACX,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,qBAAqB,CAC9B,GAAG,EACH,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,gCAAgC,CAC1C,MAAkB,EAClB,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,WAAW,CACpB,MAAM,EACN,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,wBAAwB,CAClC,UAA+B,EAC/B,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QACvF,CAAC;QAED,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IACvF,CAAC;IAEM,MAAM,CAAC,+BAA+B,CACzC,GAAW,EACX,
|
|
1
|
+
{"version":3,"file":"CryptoSignatureValidation.js","sourceRoot":"","sources":["../../src/signature/CryptoSignatureValidation.ts"],"names":[],"mappings":"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"}
|
package/lib-web/nmshd.crypto.js
CHANGED
|
@@ -539,22 +539,48 @@ const CoreBuffer_1 = __webpack_require__(/*! ./CoreBuffer */ "./dist/CoreBuffer.
|
|
|
539
539
|
const CryptoSecretKey_1 = __webpack_require__(/*! ./encryption/CryptoSecretKey */ "./dist/encryption/CryptoSecretKey.js");
|
|
540
540
|
const SodiumWrapper_1 = __webpack_require__(/*! ./SodiumWrapper */ "./dist/SodiumWrapper.js");
|
|
541
541
|
class CryptoDerivation {
|
|
542
|
-
static async
|
|
542
|
+
static async deriveKeyFromPassword(password, salt, keyAlgorithm = 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */, derivationAlgorithm = "argon2id" /* CryptoDerivationAlgorithm.ARGON2ID */, opslimit = 100000, memlimit = 8192) {
|
|
543
|
+
const sodium = (await SodiumWrapper_1.SodiumWrapper.ready());
|
|
544
|
+
if (salt.buffer.byteLength !== sodium.crypto_pwhash_SALTBYTES) {
|
|
545
|
+
throw new Error(`The salt must be exactly ${sodium.crypto_pwhash_SALTBYTES} bytes long!`);
|
|
546
|
+
}
|
|
547
|
+
if (opslimit < sodium.crypto_pwhash_OPSLIMIT_MIN) {
|
|
548
|
+
throw new Error(`The opslimit must be higher than ${sodium.crypto_pwhash_OPSLIMIT_MIN}.`);
|
|
549
|
+
}
|
|
550
|
+
if (sodium.crypto_pwhash_OPSLIMIT_MAX > 0 && opslimit > sodium.crypto_pwhash_OPSLIMIT_MAX) {
|
|
551
|
+
throw new Error(`The opslimit must be lower than ${sodium.crypto_pwhash_OPSLIMIT_MAX}.`);
|
|
552
|
+
}
|
|
553
|
+
if (memlimit < sodium.crypto_pwhash_MEMLIMIT_MIN) {
|
|
554
|
+
throw new Error(`The memlimit must be higher than ${sodium.crypto_pwhash_MEMLIMIT_MIN}.`);
|
|
555
|
+
}
|
|
556
|
+
if (sodium.crypto_pwhash_MEMLIMIT_MAX > 0 && memlimit > sodium.crypto_pwhash_MEMLIMIT_MAX) {
|
|
557
|
+
throw new Error(`The memlimit must be lower than ${sodium.crypto_pwhash_MEMLIMIT_MAX}.`);
|
|
558
|
+
}
|
|
559
|
+
let keyLength;
|
|
543
560
|
switch (keyAlgorithm) {
|
|
544
561
|
case 1 /* CryptoEncryptionAlgorithm.AES128_GCM */:
|
|
562
|
+
keyLength = 16;
|
|
563
|
+
break;
|
|
545
564
|
case 2 /* CryptoEncryptionAlgorithm.AES256_GCM */:
|
|
546
565
|
case 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */:
|
|
566
|
+
keyLength = 32;
|
|
547
567
|
break;
|
|
548
568
|
default:
|
|
549
569
|
throw new Error("KeyAlgorithm not supported.");
|
|
550
570
|
}
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
571
|
+
let derivationAlgorithmAsNumber;
|
|
572
|
+
switch (derivationAlgorithm) {
|
|
573
|
+
case "argon2i" /* CryptoDerivationAlgorithm.ARGON2I */:
|
|
574
|
+
derivationAlgorithmAsNumber = 1;
|
|
575
|
+
break;
|
|
576
|
+
case "argon2id" /* CryptoDerivationAlgorithm.ARGON2ID */:
|
|
577
|
+
derivationAlgorithmAsNumber = 2;
|
|
578
|
+
break;
|
|
579
|
+
default:
|
|
580
|
+
throw new Error("DerivationAlgorithm not supported.");
|
|
554
581
|
}
|
|
555
|
-
const
|
|
556
|
-
const
|
|
557
|
-
const hashBuffer = CoreBuffer_1.CoreBuffer.fromString(pwhash, CoreBuffer_1.Encoding.Hex);
|
|
582
|
+
const pwhash = (await SodiumWrapper_1.SodiumWrapper.ready()).crypto_pwhash(keyLength, password.buffer, salt.buffer, opslimit, memlimit, derivationAlgorithmAsNumber);
|
|
583
|
+
const hashBuffer = CoreBuffer_1.CoreBuffer.from(pwhash);
|
|
558
584
|
return CryptoSecretKey_1.CryptoSecretKey.from({ secretKey: hashBuffer, algorithm: keyAlgorithm });
|
|
559
585
|
}
|
|
560
586
|
static async deriveKeyFromBase(baseKey, keyId, context, keyAlgorithm = 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */) {
|
|
@@ -900,14 +926,14 @@ class CryptoValidation {
|
|
|
900
926
|
let error;
|
|
901
927
|
if (buffer instanceof CoreBuffer_1.CoreBuffer) {
|
|
902
928
|
if (buffer.buffer.byteLength < minBytes) {
|
|
903
|
-
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer has a minimum of ${minBytes} bytes.`);
|
|
929
|
+
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer within property ${propertyName} has a minimum of ${minBytes} bytes.`);
|
|
904
930
|
}
|
|
905
931
|
else if (buffer.buffer.byteLength > maxBytes) {
|
|
906
|
-
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer has a maximum of ${maxBytes} bytes.`);
|
|
932
|
+
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer within property ${propertyName} has a maximum of ${maxBytes} bytes.`);
|
|
907
933
|
}
|
|
908
934
|
}
|
|
909
935
|
else {
|
|
910
|
-
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer,
|
|
936
|
+
error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.WrongBuffer, `Buffer within property ${propertyName} must be of instance CoreBuffer.`);
|
|
911
937
|
}
|
|
912
938
|
if (error && throwError)
|
|
913
939
|
throw error;
|
|
@@ -1053,10 +1079,10 @@ class CryptoValidation {
|
|
|
1053
1079
|
throw error;
|
|
1054
1080
|
return error;
|
|
1055
1081
|
}
|
|
1056
|
-
static checkNonceAsString(nonce,
|
|
1082
|
+
static checkNonceAsString(nonce, _algorithm, propertyName = "nonce", throwError = true) {
|
|
1057
1083
|
return this.checkSerializedBuffer(nonce, 12, 24, propertyName, throwError);
|
|
1058
1084
|
}
|
|
1059
|
-
static checkNonceAsBuffer(nonce,
|
|
1085
|
+
static checkNonceAsBuffer(nonce, _algorithm, propertyName = "nonce", throwError = true) {
|
|
1060
1086
|
return this.checkBuffer(nonce, 12, 24, propertyName, throwError);
|
|
1061
1087
|
}
|
|
1062
1088
|
static checkNonce(nonce, algorithm, propertyName = "nonce", throwError = true) {
|
|
@@ -1187,10 +1213,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
1187
1213
|
exports.buildInformation = void 0;
|
|
1188
1214
|
const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
|
|
1189
1215
|
exports.buildInformation = {
|
|
1190
|
-
version: "2.0
|
|
1191
|
-
build: "
|
|
1192
|
-
date: "2024-
|
|
1193
|
-
commit: "
|
|
1216
|
+
version: "2.1.0",
|
|
1217
|
+
build: "28",
|
|
1218
|
+
date: "2024-10-22T15:51:22+00:00",
|
|
1219
|
+
commit: "8bfa3227909fac9c467a0d7dd5e2bd7e497cf9d1",
|
|
1194
1220
|
dependencies: {"libsodium-wrappers-sumo":"0.7.15","uuid":"10.0.0"},
|
|
1195
1221
|
libraries: {
|
|
1196
1222
|
serval: ts_serval_1.buildInformation
|
|
@@ -2091,10 +2117,10 @@ class CryptoExchangeValidation extends CryptoValidation_1.CryptoValidation {
|
|
|
2091
2117
|
throw error;
|
|
2092
2118
|
return error;
|
|
2093
2119
|
}
|
|
2094
|
-
static checkExchangePrivateKeyAsString(privateKey,
|
|
2120
|
+
static checkExchangePrivateKeyAsString(privateKey, _algorithm, propertyName = "privateKey", throwError = true) {
|
|
2095
2121
|
return super.checkSerializedBuffer(privateKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
2096
2122
|
}
|
|
2097
|
-
static checkExchangePrivateKeyAsBuffer(privateKey,
|
|
2123
|
+
static checkExchangePrivateKeyAsBuffer(privateKey, _algorithm, propertyName = "privateKey", throwError = true) {
|
|
2098
2124
|
return super.checkBuffer(privateKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
2099
2125
|
}
|
|
2100
2126
|
static checkExchangePrivateKey(privateKey, algorithm, propertyName = "privateKey", throwError = true) {
|
|
@@ -2103,10 +2129,10 @@ class CryptoExchangeValidation extends CryptoValidation_1.CryptoValidation {
|
|
|
2103
2129
|
}
|
|
2104
2130
|
return this.checkExchangePrivateKeyAsBuffer(privateKey, algorithm, propertyName, throwError);
|
|
2105
2131
|
}
|
|
2106
|
-
static checkExchangePublicKeyAsString(publicKey,
|
|
2132
|
+
static checkExchangePublicKeyAsString(publicKey, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
2107
2133
|
return super.checkSerializedBuffer(publicKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
2108
2134
|
}
|
|
2109
|
-
static checkExchangePublicKeyAsBuffer(publicKey,
|
|
2135
|
+
static checkExchangePublicKeyAsBuffer(publicKey, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
2110
2136
|
return super.checkBuffer(publicKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
|
|
2111
2137
|
}
|
|
2112
2138
|
static checkExchangePublicKey(publicKey, algorithm, propertyName = "publicKey", throwError = true) {
|
|
@@ -3576,10 +3602,10 @@ class CryptoSignatureValidation extends CryptoValidation_1.CryptoValidation {
|
|
|
3576
3602
|
}
|
|
3577
3603
|
return this.checkSignaturePrivateKeyAsBuffer(privateKey, propertyName, throwError);
|
|
3578
3604
|
}
|
|
3579
|
-
static checkSignaturePublicKeyAsString(key,
|
|
3605
|
+
static checkSignaturePublicKeyAsString(key, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
3580
3606
|
return super.checkSerializedBuffer(key, this.PUBLIC_KEY_MIN_BYTES, this.PUBLIC_KEY_MAX_BYTES, propertyName, throwError);
|
|
3581
3607
|
}
|
|
3582
|
-
static checkSignaturePublicKeyAsBuffer(buffer,
|
|
3608
|
+
static checkSignaturePublicKeyAsBuffer(buffer, _algorithm, propertyName = "publicKey", throwError = true) {
|
|
3583
3609
|
return super.checkBuffer(buffer, this.PUBLIC_KEY_MIN_BYTES, this.PUBLIC_KEY_MAX_BYTES, propertyName, throwError);
|
|
3584
3610
|
}
|
|
3585
3611
|
static checkSignaturePublicKey(publicKey, algorithm, propertyName = "publicKey", throwError = true) {
|