test,crypto: update WebCryptoAPI WPT

nodejs · Sep 20, 2024 · 0816051 · 0816051
1 parent 260f1f4
commit 0816051
Show file tree

Hide file tree

Showing 20 changed files with 405 additions and 328 deletions.
diff --git a/test/fixtures/wpt/README.md b/test/fixtures/wpt/README.md
@@ -32,7 +32,7 @@ Last update:
 - user-timing: https://github.com/web-platform-tests/wpt/tree/5ae85bf826/user-timing
 - wasm/jsapi: https://github.com/web-platform-tests/wpt/tree/cde25e7e3c/wasm/jsapi
 - wasm/webapi: https://github.com/web-platform-tests/wpt/tree/fd1b23eeaa/wasm/webapi
-- WebCryptoAPI: https://github.com/web-platform-tests/wpt/tree/272064ebf9/WebCryptoAPI
+- WebCryptoAPI: https://github.com/web-platform-tests/wpt/tree/203d2ac459/WebCryptoAPI
 - webidl/ecmascript-binding/es-exceptions: https://github.com/web-platform-tests/wpt/tree/a370aad338/webidl/ecmascript-binding/es-exceptions
 - webmessaging/broadcastchannel: https://github.com/web-platform-tests/wpt/tree/e97fac4791/webmessaging/broadcastchannel
 - webstorage: https://github.com/web-platform-tests/wpt/tree/9dafa89214/webstorage

diff --git a/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js b/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js
@@ -1,12 +1,19 @@
+function define_tests_25519() {
+    return define_tests("X25519");
+}
+
+function define_tests_448() {
+    return define_tests("X448");
+}
 
-function define_tests() {
+function define_tests(algorithmName) {
   // May want to test prefixed implementations.
   var subtle = self.crypto.subtle;
 
   // Verify the derive functions perform checks against the all-zero value results,
   // ensuring small-order points are rejected.
   // https://www.rfc-editor.org/rfc/rfc7748#section-6.1
-  Object.keys(kSmallOrderPoint).forEach(function(algorithmName) {
+  {
       kSmallOrderPoint[algorithmName].forEach(function(test) {
           promise_test(async() => {
               let derived;
@@ -28,15 +35,16 @@ function define_tests() {
               assert_equals(derived, undefined, "Operation succeeded, but should not have.");
           }, algorithmName + " key derivation checks for all-zero value result with a key of order " + test.order);
       });
-  });
+  }
 
   return importKeys(pkcs8, spki, sizes)
   .then(function(results) {
       publicKeys = results.publicKeys;
       privateKeys = results.privateKeys;
       noDeriveBitsKeys = results.noDeriveBitsKeys;
+      ecdhKeys = results.ecdhKeys;
 
-      Object.keys(sizes).forEach(function(algorithmName) {
+      {
           // Basic success case
           promise_test(function(test) {
               return subtle.deriveBits({name: algorithmName, public: publicKeys[algorithmName]}, privateKeys[algorithmName], 8 * sizes[algorithmName])
@@ -101,11 +109,7 @@ function define_tests() {
 
           // - wrong algorithm
           promise_test(function(test) {
-              publicKey = publicKeys["X25519"];
-              if (algorithmName === "X25519") {
-                  publicKey = publicKeys["X448"];
-              }
-              return subtle.deriveBits({name: algorithmName, public: publicKey}, privateKeys[algorithmName], 8 * sizes[algorithmName])
+              return subtle.deriveBits({name: algorithmName, public: ecdhKeys[algorithmName]}, privateKeys[algorithmName], 8 * sizes[algorithmName])
               .then(function(derivation) {
                   assert_unreached("deriveBits succeeded but should have failed with InvalidAccessError");
               }, function(err) {
@@ -165,16 +169,17 @@ function define_tests() {
                   assert_equals(err.name, "OperationError", "Should throw correct error, not " + err.name + ": " + err.message);
               });
           }, algorithmName + " asking for too many bits");
-      });
+      }
   });
 
   function importKeys(pkcs8, spki, sizes) {
       var privateKeys = {};
       var publicKeys = {};
       var noDeriveBitsKeys = {};
+      var ecdhPublicKeys = {};
 
       var promises = [];
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveBits", "deriveKey"])
@@ -184,8 +189,8 @@ function define_tests() {
                               privateKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveKey"])
@@ -195,8 +200,8 @@ function define_tests() {
                               noDeriveBitsKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(spki).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("spki", spki[algorithmName],
                                           {name: algorithmName},
                                           false, [])
@@ -206,10 +211,17 @@ function define_tests() {
                               publicKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-
+      }
+      {
+          var operation = subtle.importKey("spki", ecSPKI,
+                                           {name: "ECDH", namedCurve: "P-256"},
+                                           false, [])
+                          .then(function(key) {
+                              ecdhPublicKeys[algorithmName] = key;
+                          });
+      }
       return Promise.all(promises)
-             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveBitsKeys: noDeriveBitsKeys}});
+             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveBitsKeys: noDeriveBitsKeys, ecdhKeys: ecdhPublicKeys}});
   }
 
   // Compares two ArrayBuffer or ArrayBufferView objects. If bitCount is

diff --git a/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js b/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_curve25519.https.any.js
@@ -0,0 +1,10 @@
+// META: title=WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves
+// META: script=cfrg_curves_bits_fixtures.js
+// META: script=cfrg_curves_bits.js
+
+// Define subtests from a `promise_test` to ensure the harness does not
+// complete before the subtests are available. `explicit_done` cannot be used
+// for this purpose because the global `done` function is automatically invoked
+// by the WPT infrastructure in dedicated worker tests defined using the
+// "multi-global" pattern.
+promise_test(define_tests_25519, 'setup - define tests');
diff --git a/...e_bits_keys/cfrg_curves_bits.https.any.js → ...ys/cfrg_curves_bits_curve448.https.any.js b/...e_bits_keys/cfrg_curves_bits.https.any.js → ...ys/cfrg_curves_bits_curve448.https.any.js
@@ -1,4 +1,4 @@
-// META: title=WebCryptoAPI: deriveBits() Using ECDH with CFRG Elliptic Curves
+// META: title=WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves
 // META: script=cfrg_curves_bits_fixtures.js
 // META: script=cfrg_curves_bits.js
 
@@ -7,4 +7,4 @@
 // for this purpose because the global `done` function is automatically invoked
 // by the WPT infrastructure in dedicated worker tests defined using the
 // "multi-global" pattern.
-promise_test(define_tests, 'setup - define tests');
+promise_test(define_tests_448, 'setup - define tests');
diff --git a/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js b/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js
diff --git a/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js b/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js
@@ -1,5 +1,12 @@
+function define_tests_25519() {
+    return define_tests("X25519");
+}
+
+function define_tests_448() {
+    return define_tests("X448");
+}
 
-function define_tests() {
+function define_tests(algorithmName) {
   // May want to test prefixed implementations.
   var subtle = self.crypto.subtle;
 
@@ -8,7 +15,7 @@ function define_tests() {
   // https://www.rfc-editor.org/rfc/rfc7748#section-6.1
   // TODO: The spec states that the check must be done on use, but there is discussion about doing it on import.
   // https://github.com/WICG/webcrypto-secure-curves/pull/13
-  Object.keys(kSmallOrderPoint).forEach(function(algorithmName) {
+  {
       kSmallOrderPoint[algorithmName].forEach(function(test) {
           promise_test(async() => {
               let derived;
@@ -32,10 +39,10 @@ function define_tests() {
               assert_equals(derived, undefined, "Operation succeeded, but should not have.");
           }, algorithmName + " deriveBits checks for all-zero value result with a key of order " + test.order);
       });
-  });
+  }
 
   // Ensure the keys generated by each algorithm are valid for key derivation.
-  Object.keys(sizes).forEach(function(algorithmName) {
+  {
       promise_test(async() => {
           let derived;
           try {
@@ -46,15 +53,16 @@ function define_tests() {
           }
           assert_false (derived === undefined, "Key derivation failed.");
       }, "Key derivation using a " + algorithmName + " generated keys.");
-  });
+  }
 
   return importKeys(pkcs8, spki, sizes)
   .then(function(results) {
       publicKeys = results.publicKeys;
       privateKeys = results.privateKeys;
       noDeriveKeyKeys = results.noDeriveKeyKeys;
+      ecdhKeys = results.ecdhKeys;
 
-      Object.keys(sizes).forEach(function(algorithmName) {
+      {
           // Basic success case
           promise_test(function(test) {
               return subtle.deriveKey({name: algorithmName, public: publicKeys[algorithmName]}, privateKeys[algorithmName], {name: "HMAC", hash: "SHA-256", length: 256}, true, ["sign", "verify"])
@@ -102,11 +110,7 @@ function define_tests() {
 
           // - wrong algorithm
           promise_test(function(test) {
-              publicKey = publicKeys["X25519"];
-              if (algorithmName === "X25519") {
-                  publicKey = publicKeys["X448"];
-              }
-              return subtle.deriveKey({name: algorithmName, public: publicKey}, privateKeys[algorithmName], {name: "HMAC", hash: "SHA-256", length: 256}, true, ["sign", "verify"])
+              return subtle.deriveKey({name: algorithmName, public: ecdhKeys[algorithmName]}, privateKeys[algorithmName], {name: "HMAC", hash: "SHA-256", length: 256}, true, ["sign", "verify"])
               .then(function(key) {return crypto.subtle.exportKey("raw", key);})
               .then(function(exportedKey) {
                   assert_unreached("deriveKey succeeded but should have failed with InvalidAccessError");
@@ -161,16 +165,17 @@ function define_tests() {
                   });
               });
           }, algorithmName + " public property value is a secret key");
-      });
+      }
   });
 
   function importKeys(pkcs8, spki, sizes) {
       var privateKeys = {};
       var publicKeys = {};
       var noDeriveKeyKeys = {};
+      var ecdhPublicKeys = {};
 
       var promises = [];
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveBits", "deriveKey"])
@@ -180,8 +185,8 @@ function define_tests() {
                             privateKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(pkcs8).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("pkcs8", pkcs8[algorithmName],
                                           {name: algorithmName},
                                           false, ["deriveBits"])
@@ -191,8 +196,8 @@ function define_tests() {
                             noDeriveKeyKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
-      Object.keys(spki).forEach(function(algorithmName) {
+      }
+      {
           var operation = subtle.importKey("spki", spki[algorithmName],
                                           {name: algorithmName},
                                           false, [])
@@ -202,10 +207,18 @@ function define_tests() {
                             publicKeys[algorithmName] = null;
                           });
           promises.push(operation);
-      });
+      }
+      {
+          var operation = subtle.importKey("spki", ecSPKI,
+                                           {name: "ECDH", namedCurve: "P-256"},
+                                           false, [])
+                          .then(function(key) {
+                              ecdhPublicKeys[algorithmName] = key;
+                          });
+      }
 
       return Promise.all(promises)
-             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveKeyKeys: noDeriveKeyKeys}});
+             .then(function(results) {return {privateKeys: privateKeys, publicKeys: publicKeys, noDeriveKeyKeys: noDeriveKeyKeys, ecdhKeys: ecdhPublicKeys}});
   }
 
   // Compares two ArrayBuffer or ArrayBufferView objects. If bitCount is

diff --git a/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js b/test/fixtures/wpt/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys_curve25519.https.any.js
@@ -0,0 +1,10 @@
+// META: title=WebCryptoAPI: deriveKey() Using ECDH with CFRG Elliptic Curves
+// META: script=cfrg_curves_bits_fixtures.js
+// META: script=cfrg_curves_keys.js
+
+// Define subtests from a `promise_test` to ensure the harness does not
+// complete before the subtests are available. `explicit_done` cannot be used
+// for this purpose because the global `done` function is automatically invoked
+// by the WPT infrastructure in dedicated worker tests defined using the
+// "multi-global" pattern.
+promise_test(define_tests_25519, 'setup - define tests');
diff --git a/...e_bits_keys/cfrg_curves_keys.https.any.js → ...ys/cfrg_curves_keys_curve448.https.any.js b/...e_bits_keys/cfrg_curves_keys.https.any.js → ...ys/cfrg_curves_keys_curve448.https.any.js
@@ -7,4 +7,4 @@
 // for this purpose because the global `done` function is automatically invoked
 // by the WPT infrastructure in dedicated worker tests defined using the
 // "multi-global" pattern.
-promise_test(define_tests, 'setup - define tests');
+promise_test(define_tests_448, 'setup - define tests');