crypto: do not add undefined hash in webcrypto normalizeAlgorithm

PR-URL: #42559 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

Author: panva

lib/internal/crypto/util.js

@@ -206,30 +206,33 @@ function validateMaxBufferLength(data, name) {
  }
 }
 
-function normalizeAlgorithm(algorithm, label = 'algorithm') {
+function normalizeAlgorithm(algorithm) {
  if (algorithm != null) {
  if (typeof algorithm === 'string')
  algorithm = { name: algorithm };
 
  if (typeof algorithm === 'object') {
  const { name } = algorithm;
- let hash;
  if (typeof name !== 'string' ||
  !ArrayPrototypeIncludes(
  kAlgorithmsKeys,
  StringPrototypeToLowerCase(name))) {
  throw lazyDOMException('Unrecognized name.', 'NotSupportedError');
  }
- if (algorithm.hash !== undefined) {
- hash = normalizeAlgorithm(algorithm.hash, 'algorithm.hash');
+ let { hash } = algorithm;
+ if (hash !== undefined) {
+ hash = normalizeAlgorithm(hash);
  if (!ArrayPrototypeIncludes(kHashTypes, hash.name))
  throw lazyDOMException('Unrecognized name.', 'NotSupportedError');
  }
- return {
+ const normalized = {
  ...algorithm,
  name: kAlgorithms[StringPrototypeToLowerCase(name)],
- hash,
  };
+ if (hash) {
+ normalized.hash = hash;
+ }
+ return normalized;
  }
  }
  throw lazyDOMException('Unrecognized name.', 'NotSupportedError');

lib/internal/crypto/webcrypto.js

@@ -587,10 +587,10 @@ async function unwrapKey(
  extractable,
  keyUsages) {
  wrappedKey = getArrayBufferOrView(wrappedKey, 'wrappedKey');
-
+ unwrapAlgo = normalizeAlgorithm(unwrapAlgo);
  let keyData = await cipherOrWrap(
  kWebCryptoCipherDecrypt,
- normalizeAlgorithm(unwrapAlgo),
+ unwrapAlgo,
  unwrappingKey,
  wrappedKey,
  'unwrapKey');

test/parallel/test-webcrypto-util.js

@@ -0,0 +1,25 @@
+// Flags: --expose-internals
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
+
+const assert = require('assert');
+
+const {
+ normalizeAlgorithm,
+} = require('internal/crypto/util');
+
+{
+ // Check that normalizeAlgorithm does not add an undefined hash property.
+ assert.strictEqual('hash' in normalizeAlgorithm({ name: 'ECDH' }), false);
+ assert.strictEqual('hash' in normalizeAlgorithm('ECDH'), false);
+}
+
+{
+ // Check that normalizeAlgorithm does not mutate object inputs.
+ const algorithm = { name: 'ECDH', hash: 'SHA-256' };
+ assert.strictEqual(normalizeAlgorithm(algorithm) !== algorithm, true);
+ assert.deepStrictEqual(algorithm, { name: 'ECDH', hash: 'SHA-256' });
+}