crypto: fix webcrypto HMAC "get key length" in deriveKey and generateKey

PR-URL: #44917
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

Author: panva

lib/internal/crypto/mac.js

@@ -14,7 +14,7 @@ const {
 }=internalBinding('crypto');
 
 const{
-getHashLength,
+getBlockSize,
  hasAnyNotIn,
  jobPromise,
  normalizeHashName,
@@ -54,7 +54,7 @@ async function hmacGenerateKey(algorithm, extractable, keyUsages) {
 thrownewERR_MISSING_OPTION('algorithm.hash');
 
 if(length===undefined)
-length=getHashLength(hash.name);
+length=getBlockSize(hash.name);
 
 validateBitLength(length,'algorithm.length',true);
 

lib/internal/crypto/util.js

@@ -340,12 +340,12 @@ function getUsagesUnion(usageSet, ...usages) {
 returnnewset;
 }
 
-functiongetHashLength(name){
+functiongetBlockSize(name){
 switch(name){
-case'SHA-1': return160;
-case'SHA-256': return256;
-case'SHA-384': return384;
-case'SHA-512': return512;
+case'SHA-1': return512;
+case'SHA-256': return512;
+case'SHA-384': return1024;
+case'SHA-512': return1024;
 }
 }
 
@@ -430,8 +430,8 @@ module.exports = {
  validateMaxBufferLength,
  bigIntArrayToUnsignedBigInt,
  bigIntArrayToUnsignedInt,
+ getBlockSize,
  getStringOption,
  getUsagesUnion,
- getHashLength,
  secureHeapUsed,
 };

lib/internal/crypto/webcrypto.js

@@ -56,6 +56,7 @@ const {
 
 const{
  getArrayBufferOrView,
+ getBlockSize,
  hasAnyNotIn,
  lazyRequire,
  normalizeAlgorithm,
@@ -200,16 +201,7 @@ function getKeyLength({ name, length, hash }) {
 returnlength;
 case'HMAC':
 if(length===undefined){
-switch(hash?.name){
-case'SHA-1':
-return160;
-case'SHA-256':
-return256;
-case'SHA-384':
-return384;
-case'SHA-512':
-return512;
-}
+returngetBlockSize(hash?.name);
 }
 
 if(typeoflength==='number'&&length!==0){

test/parallel/test-webcrypto-derivekey.js

@@ -124,10 +124,11 @@ const { webcrypto: { subtle }, KeyObject } = require('crypto');
 constvectors=[
 ['PBKDF2','deriveKey',528],
 ['HKDF','deriveKey',528],
-[{name: 'HMAC',hash: 'SHA-1'},'sign',160],
-[{name: 'HMAC',hash: 'SHA-256'},'sign',256],
-[{name: 'HMAC',hash: 'SHA-384'},'sign',384],
-[{name: 'HMAC',hash: 'SHA-512'},'sign',512],
+[{name: 'HMAC',hash: 'SHA-1'},'sign',512],
+[{name: 'HMAC',hash: 'SHA-256'},'sign',512],
+// Not long enough secret generated by ECDH
+// [{ name: 'HMAC', hash: 'SHA-384' }, 'sign', 1024],
+// [{ name: 'HMAC', hash: 'SHA-512' }, 'sign', 1024],
 ];
 
 (async()=>{
@@ -151,6 +152,28 @@ const { webcrypto: { subtle }, KeyObject } = require('crypto');
 })().then(common.mustCall());
 }
 
+{
+constvectors=[
+[{name: 'HMAC',hash: 'SHA-1'},'sign',512],
+[{name: 'HMAC',hash: 'SHA-256'},'sign',512],
+[{name: 'HMAC',hash: 'SHA-384'},'sign',1024],
+[{name: 'HMAC',hash: 'SHA-512'},'sign',1024],
+];
+
+(async()=>{
+for(const[derivedKeyAlgorithm,usage,expected]ofvectors){
+constderived=awaitsubtle.deriveKey(
+{name: 'PBKDF2',salt: newUint8Array([]),hash: 'SHA-256',iterations: 20},
+awaitsubtle.importKey('raw',newUint8Array([]),{name: 'PBKDF2'},false,['deriveKey']),
+derivedKeyAlgorithm,
+false,
+[usage]);
+
+assert.strictEqual(derived.algorithm.length,expected);
+}
+})().then(common.mustCall());
+}
+
 // Test X25519 and X448 key derivation
 {
 asyncfunctiontest(name){

test/parallel/test-webcrypto-keygen.js

@@ -551,10 +551,10 @@ const vectors = {
 
 if(length===undefined){
 switch(hash){
-case'SHA-1': length=160;break;
-case'SHA-256': length=256;break;
-case'SHA-384': length=384;break;
-case'SHA-512': length=512;break;
+case'SHA-1': length=512;break;
+case'SHA-256': length=512;break;
+case'SHA-384': length=1024;break;
+case'SHA-512': length=1024;break;
 }
 }