crypto: separate conversion from validation

Convert algorithm dictionaries on the original receiver, with name
read once. Validate normalized parameters in their operation steps
after the method-level key checks and generation usage checks.

This also makes Argon2 validation use converted parallelism and keeps
later dictionary conversion errors ahead of semantic parameter errors.

Signed-off-by: Filip Skokan <panva.ip@gmail.com>
Assisted-by: Codex
PR-URL: #66237
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>

Author: panva

lib/internal/crypto/aes.js

@@ -25,6 +25,7 @@ const {
   getUsagesMask,
   jobPromise,
   getBufferSourceByteLength,
+  validateAlgorithm,
 } = require('internal/crypto/util');
 
 const {
@@ -173,6 +174,7 @@ function asyncAesOcbCipher(mode, key, data, algorithm) {
 }
 
 function aesCipher(mode, key, data, algorithm) {
+  validateAlgorithm(algorithm, 'encrypt');
   switch (algorithm.name) {
     case 'AES-CTR': return asyncAesCtrCipher(mode, key, data, algorithm);
     case 'AES-CBC': return asyncAesCbcCipher(mode, key, data, algorithm);
@@ -185,8 +187,9 @@ function aesCipher(mode, key, data, algorithm) {
 function aesGenerateKey(algorithm, extractable, usages) {
   const { name, length } = algorithm;
 
-  const usagesSet = validateUsagesNotEmpty(
-    validateKeyUsages(usages, kUsages[name], name));
+  const usagesSet = validateKeyUsages(usages, kUsages[name], name);
+  validateAlgorithm(algorithm, 'generateKey');
+  validateUsagesNotEmpty(usagesSet);
 
   return jobPromise(() => new SecretKeyGenJob(
     kCryptoJobWebCrypto,

lib/internal/crypto/argon2.js

@@ -29,6 +29,7 @@ const {
 const {
   getArrayBufferOrView,
   jobPromise,
+  validateAlgorithm,
 } = require('internal/crypto/util');
 
 const {
@@ -203,6 +204,7 @@ function validateArgon2DeriveBitsLength(length) {
 
 function argon2DeriveBits(algorithm, baseKey, length) {
   validateArgon2DeriveBitsLength(length);
+  validateAlgorithm(algorithm, 'deriveBits');
 
   const type = {
     '__proto__': null,

lib/internal/crypto/cfrg.js

@@ -23,6 +23,7 @@ const {
   getUsagesMask,
   jobPromise,
   toUsagesSet,
+  validateAlgorithm,
 } = require('internal/crypto/util');
 
 const {
@@ -184,6 +185,8 @@ function eddsaSignVerify(key, data, algorithm, signature) {
   if (getCryptoKeyType(key) !== type)
     throw lazyDOMException(`Key must be a ${type} key`, 'InvalidAccessError');
 
+  validateAlgorithm(algorithm, mode === kSignJobModeSign ? 'sign' : 'verify');
+
   return jobPromise(() => new SignJob(
     kCryptoJobWebCrypto,
     mode,

lib/internal/crypto/chacha20_poly1305.js

@@ -9,6 +9,7 @@ const {
 const {
   getUsagesMask,
   jobPromise,
+  validateAlgorithm,
 } = require('internal/crypto/util');
 
 const {
@@ -36,6 +37,7 @@ function validateKeyLength(length) {
 }
 
 function c20pCipher(mode, key, data, algorithm) {
+  validateAlgorithm(algorithm, 'encrypt');
   return jobPromise(() => new ChaCha20Poly1305CipherJob(
     kCryptoJobWebCrypto,
     mode,

lib/internal/crypto/diffiehellman.js

@@ -61,6 +61,7 @@ const {
   numBitsToBytes,
   toBuf,
   truncateToBitLength,
+  validateAlgorithm,
   kHandle,
 } = require('internal/crypto/util');
 
@@ -332,6 +333,7 @@ function diffieHellman(options, callback) {
 // The ecdhDeriveBits function is part of the Web Crypto API and serves both
 // deriveKeys and deriveBits functions.
 function ecdhDeriveBits(algorithm, baseKey, length) {
+  validateAlgorithm(algorithm, 'deriveBits');
   const { 'public': key } = algorithm;
 
   if (getCryptoKeyType(baseKey) !== 'private') {

lib/internal/crypto/ec.js

@@ -31,6 +31,7 @@ const {
   getUsagesMask,
   jobPromise,
   normalizeHashName,
+  validateAlgorithm,
   kNamedCurveAliases,
   toUsagesSet,
 } = require('internal/crypto/util');
@@ -72,6 +73,7 @@ function ecGenerateKey(algorithm, extractable, usages) {
   const { name, namedCurve } = algorithm;
   const allowedUsages = kUsages[name];
   const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
+  validateAlgorithm(algorithm, 'generateKey');
 
   const keyAlgorithm = { name, namedCurve };
   const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
@@ -139,6 +141,7 @@ function ecImportKey(
   usages,
 ) {
   const { name, namedCurve } = algorithm;
+  validateAlgorithm(algorithm, 'importKey');
 
   let handle;
   const allowedUsages = kUsages[name];

lib/internal/crypto/hash.js

@@ -27,6 +27,7 @@ const {
   normalizeHashName,
   numBitsToBytes,
   truncateToBitLength,
+  validateAlgorithm,
   validateMaxBufferLength,
   kHandle,
   getCachedHashId,
@@ -240,6 +241,7 @@ Hmac.prototype._transform = Hash.prototype._transform;
 
 function asyncDigest(algorithm, data) {
   validateMaxBufferLength(data, 'data');
+  validateAlgorithm(algorithm, 'digest');
 
   switch (algorithm.name) {
     case 'SHA-1':

lib/internal/crypto/hkdf.js

@@ -29,6 +29,7 @@ const {
   normalizeHashName,
   toBuf,
   validateByteSource,
+  validateAlgorithm,
 } = require('internal/crypto/util');
 
 const {
@@ -182,6 +183,7 @@ function validateHkdfDeriveBitsLength(length, hash) {
 function hkdfDeriveBits(algorithm, baseKey, length) {
   const { hash, salt, info } = algorithm;
   validateHkdfDeriveBitsLength(length, hash);
+  validateAlgorithm(algorithm, 'deriveBits');
 
   if (length === 0)
     return PromiseResolve(new ArrayBuffer(0));

lib/internal/crypto/mac.js

@@ -21,6 +21,7 @@ const {
   numBitsToBytes,
   truncateToBitLength,
   validateKmacKeyLength,
+  validateAlgorithm,
 } = require('internal/crypto/util');
 
 const {
@@ -71,11 +72,12 @@ function hmacGenerateKey(algorithm, extractable, usages) {
   const {
     hash,
     name,
-    length = getBlockSize(hash.name),
   } = algorithm;
 
-  const usageSet = validateUsagesNotEmpty(
-    validateKeyUsages(usages, kUsages, name));
+  const usageSet = validateKeyUsages(usages, kUsages, name);
+  validateAlgorithm(algorithm, 'generateKey');
+  const { length = getBlockSize(hash.name) } = algorithm;
+  validateUsagesNotEmpty(usageSet);
 
   return jobPromise(() => new SecretKeyGenJob(
     kCryptoJobWebCrypto,
@@ -95,8 +97,9 @@ function kmacGenerateKey(algorithm, extractable, usages) {
     }[name],
   } = algorithm;
 
-  const usageSet = validateUsagesNotEmpty(
-    validateKeyUsages(usages, kUsages, name));
+  const usageSet = validateKeyUsages(usages, kUsages, name);
+  validateAlgorithm(algorithm, 'generateKey');
+  validateUsagesNotEmpty(usageSet);
 
   return jobPromise(() => new SecretKeyGenJob(
     kCryptoJobWebCrypto,
@@ -114,6 +117,7 @@ function macImportKey(
   usages,
 ) {
   const isHmac = algorithm.name === 'HMAC';
+  validateAlgorithm(algorithm, 'importKey');
   const usagesSet = validateKeyUsages(
     usages, kUsages, algorithm.name);
   let handle;
@@ -181,6 +185,7 @@ function hmacSignVerify(key, data, algorithm, signature) {
 }
 
 function kmacSignVerify(key, data, algorithm, signature) {
+  validateAlgorithm(algorithm, 'sign');
   const mode = signature === undefined ? kSignJobModeSign : kSignJobModeVerify;
   return jobPromise(() => new KmacJob(
     kCryptoJobWebCrypto,

lib/internal/crypto/ml_dsa.js

@@ -25,6 +25,7 @@ const {
   getUsagesMask,
   jobPromise,
   toUsagesSet,
+  validateAlgorithm,
   getBufferSourceByteLength,
 } = require('internal/crypto/util');
 
@@ -197,6 +198,8 @@ function mlDsaSignVerify(key, data, algorithm, signature) {
   if (getCryptoKeyType(key) !== type)
     throw lazyDOMException(`Key must be a ${type} key`, 'InvalidAccessError');
 
+  validateAlgorithm(algorithm, mode === kSignJobModeSign ? 'sign' : 'verify');
+
   return jobPromise(() => new SignJob(
     kCryptoJobWebCrypto,
     mode,