From 9630a77478e3e15b6f02530b6cce047bc0031096 Mon Sep 17 00:00:00 2001 From: larabr <7375870+larabr@users.noreply.github.com> Date: Wed, 17 Nov 2021 17:35:33 +0100 Subject: [PATCH] Minor changes [skip ci] --- src/crypto/hash/index.js | 35 ++++++++++++++--------------------- src/crypto/mode/gcm.js | 2 +- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/crypto/hash/index.js b/src/crypto/hash/index.js index 8e6ad9bbf..cfec8d381 100644 --- a/src/crypto/hash/index.js +++ b/src/crypto/hash/index.js @@ -111,26 +111,19 @@ export default { */ digest: function(algo, data) { switch (algo) { - case 1: - // - MD5 [HAC] + case enums.hash.md5: return this.md5(data); - case 2: - // - SHA-1 [FIPS180] + case enums.hash.sha1: return this.sha1(data); - case 3: - // - RIPE-MD/160 [HAC] + case enums.hash.ripemd: return this.ripemd(data); - case 8: - // - SHA256 [FIPS180] + case enums.hash.sha256: return this.sha256(data); - case 9: - // - SHA384 [FIPS180] + case enums.hash.sha384: return this.sha384(data); - case 10: - // - SHA512 [FIPS180] + case enums.hash.sha512: return this.sha512(data); - case 11: - // - SHA224 [FIPS180] + case enums.hash.sha224: return this.sha224(data); default: throw new Error('Invalid hash function.'); @@ -144,18 +137,18 @@ export default { */ getHashByteLength: function(algo) { switch (algo) { - case enums.hash.md5: // - MD5 [HAC] + case enums.hash.md5: return 16; - case enums.hash.sha1: // - SHA-1 [FIPS180] - case enums.hash.ripemd: // - RIPE-MD/160 [HAC] + case enums.hash.sha1: + case enums.hash.ripemd: return 20; - case enums.hash.sha256: // - SHA256 [FIPS180] + case enums.hash.sha256: return 32; - case enums.hash.sha384: // - SHA384 [FIPS180] + case enums.hash.sha384: return 48; - case enums.hash.sha512: // - SHA512 [FIPS180] + case enums.hash.sha512: return 64; - case enums.hash.sha224: // - SHA224 [FIPS180] + case enums.hash.sha224: return 28; default: throw new Error('Invalid hash algorithm.'); diff --git a/src/crypto/mode/gcm.js b/src/crypto/mode/gcm.js index a2faa3bee..424b7e1af 100644 --- a/src/crypto/mode/gcm.js +++ b/src/crypto/mode/gcm.js @@ -44,7 +44,7 @@ async function GCM(cipher, key) { if (cipher !== enums.symmetric.aes128 && cipher !== enums.symmetric.aes192 && cipher !== enums.symmetric.aes256) { - throw new Error('EAX mode supports only AES cipher'); + throw new Error('GCM mode supports only AES cipher'); } if (util.getWebCrypto() && key.length !== 24) { // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto#TOC-AES-support