crypto: fix webcrypto operation errors to be OperationError

panva · panva · commit ff4499832a73 · 2022-08-10T14:47:20.000+02:00
diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
@@ -278,7 +278,11 @@ const validateByteSource = hideStackFrames((val, name) => {
 });
 
 function onDone(resolve, reject, err, result) {
-  if (err) return reject(err);
+  if (err) {
+    return reject(lazyDOMException(
+      'The operation failed for an operation-specific reason',
+      'OperationError'));
+  }
   resolve(result);
 }
 
diff --git a/test/parallel/test-webcrypto-encrypt-decrypt-aes.js b/test/parallel/test-webcrypto-encrypt-decrypt-aes.js
@@ -119,7 +119,7 @@ async function testDecrypt({ keyBuffer, algorithm, result }) {
 
     decryptionFailing.forEach((vector) => {
       variations.push(assert.rejects(testDecrypt(vector), {
-        message: /bad decrypt/
+        name: 'OperationError'
       }));
     });
 
@@ -158,7 +158,7 @@ async function testDecrypt({ keyBuffer, algorithm, result }) {
 
     decryptionFailing.forEach((vector) => {
       variations.push(assert.rejects(testDecrypt(vector), {
-        message: /bad decrypt/
+        name: 'OperationError'
       }));
     });
 
@@ -195,7 +195,7 @@ async function testDecrypt({ keyBuffer, algorithm, result }) {
 
     decryptionFailing.forEach((vector) => {
       variations.push(assert.rejects(testDecrypt(vector), {
-        message: /bad decrypt/
+        name: 'OperationError'
       }));
     });
 
diff --git a/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js b/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js
@@ -127,7 +127,7 @@ async function testEncryptionLongPlaintext({ algorithm,
 
   return assert.rejects(
     subtle.encrypt(algorithm, publicKey, newplaintext), {
-      message: /data too large/
+      name: 'OperationError'
     });
 }
 
diff --git a/test/wpt/status/WebCryptoAPI.json b/test/wpt/status/WebCryptoAPI.json
@@ -2654,33 +2654,12 @@
   "encrypt_decrypt/aes_cbc.https.any.js": {
     "fail": {
       "expected": [
-        "AES-CBC 128-bit key, zeroPadChar",
-        "AES-CBC 128-bit key, bigPadChar",
-        "AES-CBC 128-bit key, inconsistentPadChars",
-        "AES-CBC 192-bit key, zeroPadChar",
-        "AES-CBC 192-bit key, bigPadChar",
-        "AES-CBC 192-bit key, inconsistentPadChars",
-        "AES-CBC 256-bit key, zeroPadChar",
-        "AES-CBC 256-bit key, bigPadChar",
-        "AES-CBC 256-bit key, inconsistentPadChars"
       ]
     }
   },
   "encrypt_decrypt/rsa_oaep.https.any.js": {
     "fail": {
       "expected": [
-        "RSA-OAEP with SHA-1 and no label too long plaintext",
-        "RSA-OAEP with SHA-256 and no label too long plaintext",
-        "RSA-OAEP with SHA-384 and no label too long plaintext",
-        "RSA-OAEP with SHA-512 and no label too long plaintext",
-        "RSA-OAEP with SHA-1 and empty label too long plaintext",
-        "RSA-OAEP with SHA-256 and empty label too long plaintext",
-        "RSA-OAEP with SHA-384 and empty label too long plaintext",
-        "RSA-OAEP with SHA-512 and empty label too long plaintext",
-        "RSA-OAEP with SHA-1 and a label too long plaintext",
-        "RSA-OAEP with SHA-256 and a label too long plaintext",
-        "RSA-OAEP with SHA-384 and a label too long plaintext",
-        "RSA-OAEP with SHA-512 and a label too long plaintext"
       ]
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ async function testEncryptionLongPlaintext({ algorithm,`
`127`	`127`
`128`	`128`	`return assert.rejects(`
`129`	`129`	`subtle.encrypt(algorithm, publicKey, newplaintext), {`
`130`		`- message: /data too large/`
	`130`	`+ name: 'OperationError'`
`131`	`131`	`});`
`132`	`132`	`}`
`133`	`133`