fixup! lib: improve Web Cryptography key validation ordering

nodejs · nodejs-github-bot · Apr 17, 2026 · Apr 15, 2026 · Apr 15, 2026 · Apr 15, 2026
commit ad8217c6abfc720acbf51fcf9560bc08203e5cc1
diff --git a/lib/internal/crypto/webcrypto.js b/lib/internal/crypto/webcrypto.js
@@ -920,12 +920,12 @@ async function wrapKey(format, key, wrappingKey, algorithm) {
     algorithm = normalizeAlgorithm(algorithm, 'encrypt');
   }
 
-  if (algorithm.name !== wrappingKey[kAlgorithm].name ||
-      !ArrayPrototypeIncludes(wrappingKey[kKeyUsages], 'wrapKey')) {
+  if (algorithm.name !== wrappingKey[kAlgorithm].name)
+    throw lazyDOMException('Key algorithm mismatch', 'InvalidAccessError');
+
+  if (!ArrayPrototypeIncludes(wrappingKey[kKeyUsages], 'wrapKey'))
     throw lazyDOMException(
-      'The requested operation is not valid for the provided key',
-      'InvalidAccessError');
-  }
+      'Unable to use this key to wrapKey', 'InvalidAccessError');
 
   let keyData = await FunctionPrototypeCall(exportKey, this, format, key);
 
@@ -1005,12 +1005,12 @@ async function unwrapKey(
 
   unwrappedKeyAlgo = normalizeAlgorithm(unwrappedKeyAlgo, 'importKey');
 
-  if (unwrapAlgo.name !== unwrappingKey[kAlgorithm].name ||
-      !ArrayPrototypeIncludes(unwrappingKey[kKeyUsages], 'unwrapKey')) {
+  if (unwrapAlgo.name !== unwrappingKey[kAlgorithm].name)
+    throw lazyDOMException('Key algorithm mismatch', 'InvalidAccessError');
+
+  if (!ArrayPrototypeIncludes(unwrappingKey[kKeyUsages], 'unwrapKey'))
     throw lazyDOMException(
-      'The requested operation is not valid for the provided key',
-      'InvalidAccessError');
-  }
+      'Unable to use this key to unwrapKey', 'InvalidAccessError');
 
   let keyData = await cipherOrWrap(
     kWebCryptoCipherDecrypt,
@@ -1186,12 +1186,12 @@ async function encrypt(algorithm, key, data) {
 
   algorithm = normalizeAlgorithm(algorithm, 'encrypt');
 
-  if (algorithm.name !== key[kAlgorithm].name ||
-      !ArrayPrototypeIncludes(key[kKeyUsages], 'encrypt')) {
+  if (algorithm.name !== key[kAlgorithm].name)
+    throw lazyDOMException('Key algorithm mismatch', 'InvalidAccessError');
+
+  if (!ArrayPrototypeIncludes(key[kKeyUsages], 'encrypt'))
     throw lazyDOMException(
-      'The requested operation is not valid for the provided key',
-      'InvalidAccessError');
-  }
+      'Unable to use this key to encrypt', 'InvalidAccessError');
 
   return await cipherOrWrap(
     kWebCryptoCipherEncrypt,
@@ -1223,12 +1223,12 @@ async function decrypt(algorithm, key, data) {
 
   algorithm = normalizeAlgorithm(algorithm, 'decrypt');
 
-  if (algorithm.name !== key[kAlgorithm].name ||
-      !ArrayPrototypeIncludes(key[kKeyUsages], 'decrypt')) {
+  if (algorithm.name !== key[kAlgorithm].name)
+    throw lazyDOMException('Key algorithm mismatch', 'InvalidAccessError');
+
+  if (!ArrayPrototypeIncludes(key[kKeyUsages], 'decrypt'))
     throw lazyDOMException(
-      'The requested operation is not valid for the provided key',
-      'InvalidAccessError');
-  }
+      'Unable to use this key to decrypt', 'InvalidAccessError');
 
   return await cipherOrWrap(
     kWebCryptoCipherDecrypt,

diff --git a/test/parallel/test-webcrypto-encrypt-decrypt-aes.js b/test/parallel/test-webcrypto-encrypt-decrypt-aes.js
@@ -49,7 +49,7 @@ async function testEncryptNoEncrypt({ keyBuffer, algorithm, plaintext }) {
     ['decrypt']);
 
   return assert.rejects(subtle.encrypt(algorithm, key, plaintext), {
-    message: /The requested operation is not valid for the provided key/
+    message: /Unable to use this key to encrypt/
   });
 }
 
@@ -65,7 +65,7 @@ async function testEncryptNoDecrypt({ keyBuffer, algorithm, plaintext }) {
   const output = await subtle.encrypt(algorithm, key, plaintext);
 
   return assert.rejects(subtle.decrypt(algorithm, key, output), {
-    message: /The requested operation is not valid for the provided key/
+    message: /Unable to use this key to decrypt/
   });
 }
 
@@ -80,7 +80,7 @@ async function testEncryptWrongAlg({ keyBuffer, algorithm, plaintext }, alg) {
     ['encrypt']);
 
   return assert.rejects(subtle.encrypt(algorithm, key, plaintext), {
-    message: /The requested operation is not valid for the provided key/
+    message: /Key algorithm mismatch/
   });
 }
 

diff --git a/test/parallel/test-webcrypto-encrypt-decrypt-chacha20-poly1305.js b/test/parallel/test-webcrypto-encrypt-decrypt-chacha20-poly1305.js
@@ -48,7 +48,7 @@ async function testEncryptNoEncrypt({ keyBuffer, algorithm, plaintext }) {
     ['decrypt']);
 
   return assert.rejects(subtle.encrypt(algorithm, key, plaintext), {
-    message: /The requested operation is not valid for the provided key/
+    message: /Unable to use this key to encrypt/
   });
 }
 
@@ -63,7 +63,7 @@ async function testEncryptNoDecrypt({ keyBuffer, algorithm, plaintext }) {
   const output = await subtle.encrypt(algorithm, key, plaintext);
 
   return assert.rejects(subtle.decrypt(algorithm, key, output), {
-    message: /The requested operation is not valid for the provided key/
+    message: /Unable to use this key to decrypt/
   });
 }
 
@@ -77,7 +77,7 @@ async function testEncryptWrongAlg({ keyBuffer, algorithm, plaintext }, alg) {
     ['encrypt']);
 
   return assert.rejects(subtle.encrypt(algorithm, key, plaintext), {
-    message: /The requested operation is not valid for the provided key/
+    message: /Key algorithm mismatch/
   });
 }
 

diff --git a/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js b/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js
@@ -147,7 +147,7 @@ async function testEncryptionWrongKey({ algorithm,
     ['decrypt']);
   return assert.rejects(
     subtle.encrypt(algorithm, privateKey, plaintext), {
-      message: /The requested operation is not valid/
+      message: /Unable to use this key to encrypt/
     });
 }
 
@@ -167,7 +167,7 @@ async function testEncryptionBadUsage({ algorithm,
     ['decrypt']);
   return assert.rejects(
     subtle.encrypt(algorithm, publicKey, plaintext), {
-      message: /The requested operation is not valid/
+      message: /Unable to use this key to encrypt/
     });
 }
 
@@ -191,7 +191,7 @@ async function testDecryptionWrongKey({ ciphertext,
 
   return assert.rejects(
     subtle.decrypt(algorithm, publicKey, ciphertext), {
-      message: /The requested operation is not valid/
+      message: /Unable to use this key to decrypt/
     });
 }
 
@@ -215,7 +215,7 @@ async function testDecryptionBadUsage({ ciphertext,
 
   return assert.rejects(
     subtle.decrypt(algorithm, publicKey, ciphertext), {
-      message: /The requested operation is not valid/
+      message: /Unable to use this key to decrypt/
     });
 }
 

diff --git a/test/parallel/test-webcrypto-encrypt-decrypt.js b/test/parallel/test-webcrypto-encrypt-decrypt.js
@@ -43,14 +43,14 @@ const { subtle } = globalThis.crypto;
       name: 'RSA-OAEP',
     }, privateKey, buf), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key'
+      message: 'Unable to use this key to encrypt'
     });
 
     await assert.rejects(() => subtle.decrypt({
       name: 'RSA-OAEP',
     }, publicKey, ciphertext), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key'
+      message: 'Unable to use this key to decrypt'
     });
   }
 
@@ -88,14 +88,14 @@ if (!process.features.openssl_is_boringssl) {
       name: 'RSA-OAEP',
     }, privateKey, buf), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key'
+      message: 'Unable to use this key to encrypt'
     });
 
     await assert.rejects(() => subtle.decrypt({
       name: 'RSA-OAEP',
     }, publicKey, ciphertext), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key'
+      message: 'Unable to use this key to decrypt'
     });
   }
 

diff --git a/test/parallel/test-webcrypto-wrap-unwrap.js b/test/parallel/test-webcrypto-wrap-unwrap.js
@@ -405,7 +405,7 @@ function testWrapping(name, keys) {
       iv: new Uint8Array(12),
     }), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key',
+      message: 'Key algorithm mismatch',
     });
 
   // Missing wrapKey usage: aesKey only has encrypt/decrypt, not wrapKey.
@@ -423,7 +423,7 @@ function testWrapping(name, keys) {
       iv: new Uint8Array(12),
     }), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key',
+      message: 'Unable to use this key to wrapKey',
     });
 
   // Correct wrapping key algorithm and usage results in the expected
@@ -454,7 +454,7 @@ function testWrapping(name, keys) {
       iv: new Uint8Array(12),
     }, { name: 'AES-GCM', length: 128 }, true, ['encrypt']), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key',
+      message: 'Key algorithm mismatch',
     });
 
   // Missing unwrapKey usage: aesKey only has encrypt/decrypt, not unwrapKey.
@@ -464,6 +464,6 @@ function testWrapping(name, keys) {
       iv: new Uint8Array(12),
     }, { name: 'AES-GCM', length: 128 }, true, ['encrypt']), {
       name: 'InvalidAccessError',
-      message: 'The requested operation is not valid for the provided key',
+      message: 'Unable to use this key to unwrapKey',
     });
 })().then(common.mustCall());