fixup! crypto: do not add undefined hash in webcrypto normalizeAlgorithm

nodejs · Apr 1, 2022 · baa826f · baa826f
1 parent 5de34e7
commit baa826f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
@@ -212,7 +212,6 @@ function normalizeAlgorithm(algorithm) {
       algorithm = { name: algorithm };
 
     if (typeof algorithm === 'object') {
-      algorithm = { ...algorithm };
       const { name } = algorithm;
       if (typeof name !== 'string' ||
           !ArrayPrototypeIncludes(
@@ -222,7 +221,7 @@ function normalizeAlgorithm(algorithm) {
       }
       algorithm.name = kAlgorithms[StringPrototypeToLowerCase(name)];
       if (algorithm.hash !== undefined) {
-        const hash = normalizeAlgorithm(algorithm.hash, 'algorithm.hash');
+        const hash = normalizeAlgorithm(algorithm.hash);
         if (!ArrayPrototypeIncludes(kHashTypes, hash.name))
           throw lazyDOMException('Unrecognized name.', 'NotSupportedError');
         algorithm.hash = hash;

diff --git a/lib/internal/crypto/webcrypto.js b/lib/internal/crypto/webcrypto.js
@@ -557,10 +557,10 @@ async function unwrapKey(
   extractable,
   keyUsages) {
   wrappedKey = getArrayBufferOrView(wrappedKey, 'wrappedKey');
-
+  unwrapAlgo = normalizeAlgorithm(unwrapAlgo)
   let keyData = await cipherOrWrap(
     kWebCryptoCipherDecrypt,
-    normalizeAlgorithm(unwrapAlgo),
+    unwrapAlgo,
     unwrappingKey,
     wrappedKey,
     'unwrapKey');