web-platform-tests · jgraham · Jun 29, 2016 · Jun 29, 2016
diff --git a/WebCryptoAPI/generateKey/failures.js b/WebCryptoAPI/generateKey/failures.js
@@ -35,6 +35,9 @@ function run_test(algorithmNames) {
     ];
 
     var testVectors = [];
+    if (algorithmNames && !Array.isArray(algorithmNames)) {
+        algorithmNames = [algorithmNames];
+    };
     allTestVectors.forEach(function(vector) {
         if (!algorithmNames || algorithmNames.includes(vector.name)) {
             testVectors.push(vector);

diff --git a/WebCryptoAPI/generateKey/failures_AES-CBC.worker.js b/WebCryptoAPI/generateKey/failures_AES-CBC.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["AES-CBC"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_AES-CTR.worker.js b/WebCryptoAPI/generateKey/failures_AES-CTR.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["AES-CTR"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_AES-GCM.worker.js b/WebCryptoAPI/generateKey/failures_AES-GCM.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["AES-GCM"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_AES-KW.worker.js b/WebCryptoAPI/generateKey/failures_AES-KW.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["AES-KW"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_ECDH.worker.js b/WebCryptoAPI/generateKey/failures_ECDH.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["ECDH"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_ECDSA.worker.js b/WebCryptoAPI/generateKey/failures_ECDSA.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["ECDSA"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_HMAC.worker.js b/WebCryptoAPI/generateKey/failures_HMAC.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["HMAC"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_RSA-OAEP.worker.js b/WebCryptoAPI/generateKey/failures_RSA-OAEP.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["RSA-OAEP"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_RSA-PSS.worker.js b/WebCryptoAPI/generateKey/failures_RSA-PSS.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["RSA-PSS"]);
+done();
diff --git a/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.worker.js b/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.worker.js
@@ -0,0 +1,6 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("failures.js");
+run_test(["RSASSA-PKCS1-v1_5"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes.js b/WebCryptoAPI/generateKey/successes.js
@@ -16,7 +16,7 @@ function run_test(algorithmNames) {
 // helper functions that generate all possible test parameters for
 // different situations.
 
-    var testVectors = [ // Parameters that should work for generateKey
+    var allTestVectors = [ // Parameters that should work for generateKey
         {name: "AES-CTR",  resultType: CryptoKey, usages: ["encrypt", "decrypt", "wrapKey", "unwrapKey"], mandatoryUsages: []},
         {name: "AES-CBC",  resultType: CryptoKey, usages: ["encrypt", "decrypt", "wrapKey", "unwrapKey"], mandatoryUsages: []},
         {name: "AES-GCM",  resultType: CryptoKey, usages: ["encrypt", "decrypt", "wrapKey", "unwrapKey"], mandatoryUsages: []},
@@ -29,6 +29,15 @@ function run_test(algorithmNames) {
         {name: "ECDH",     resultType: "CryptoKeyPair", usages: ["deriveKey", "deriveBits"], mandatoryUsages: ["deriveKey", "deriveBits"]}
     ];
 
+    var testVectors = [];
+    if (algorithmNames && !Array.isArray(algorithmNames)) {
+        algorithmNames = [algorithmNames];
+    };
+    allTestVectors.forEach(function(vector) {
+        if (!algorithmNames || algorithmNames.includes(vector.name)) {
+            testVectors.push(vector);
+        }
+    });
 
     function parameterString(algorithm, extractable, usages) {
         var result = "(" +

diff --git a/WebCryptoAPI/generateKey/successes_AES-CBC.worker.js b/WebCryptoAPI/generateKey/successes_AES-CBC.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["AES-CBC"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_AES-CTR.worker.js b/WebCryptoAPI/generateKey/successes_AES-CTR.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["AES-CTR"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_AES-GCM.worker.js b/WebCryptoAPI/generateKey/successes_AES-GCM.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["AES-GCM"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_AES-KW.worker.js b/WebCryptoAPI/generateKey/successes_AES-KW.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["AES-KW"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_ECDH.worker.js b/WebCryptoAPI/generateKey/successes_ECDH.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["ECDH"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_ECDSA.worker.js b/WebCryptoAPI/generateKey/successes_ECDSA.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["ECDSA"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_HMAC.worker.js b/WebCryptoAPI/generateKey/successes_HMAC.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["HMAC"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_RSA-OAEP.worker.js b/WebCryptoAPI/generateKey/successes_RSA-OAEP.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["RSA-OAEP"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_RSA-PSS.worker.js b/WebCryptoAPI/generateKey/successes_RSA-PSS.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["RSA-PSS"]);
+done();
diff --git a/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.worker.js b/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.worker.js
@@ -0,0 +1,7 @@
+// <meta> timeout=long
+importScripts("/resources/testharness.js");
+importScripts("../util/helpers.js");
+importScripts("successes.js");
+
+run_test(["RSASSA-PKCS1-v1_5"]);
+done();
diff --git a/WebCryptoAPI/generateKey/test_aes-cbc.html b/WebCryptoAPI/generateKey/test_aes-cbc.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() Successful Calls</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="successes.js"></script>
+
+<h1>generateKey Tests for Good Parameters</h1>
+<p>
+    <strong>Warning!</strong> RSA key generation is intrinsically
+    very slow, so the related tests can take up to
+    several minutes to complete, depending on browser!
+</p>
+
+<div id="log"></div>
+<script>
+run_test("AES-CBC");
+</script>
diff --git a/WebCryptoAPI/generateKey/test_aes-ctr.html b/WebCryptoAPI/generateKey/test_aes-ctr.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() Successful Calls</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="successes.js"></script>
+
+<h1>generateKey Tests for Good Parameters</h1>
+<p>
+    <strong>Warning!</strong> RSA key generation is intrinsically
+    very slow, so the related tests can take up to
+    several minutes to complete, depending on browser!
+</p>
+
+<div id="log"></div>
+<script>
+run_test("AES-CTR");
+</script>
diff --git a/WebCryptoAPI/generateKey/test_failures_AES-CBC.html b/WebCryptoAPI/generateKey/test_failures_AES-CBC.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() for Failures</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="failures.js"></script>
+
+<h1>generateKey Tests for Bad Parameters</h1>
+
+<div id="log"></div>
+<script>
+run_test(["AES-CBC"]);
+</script>
diff --git a/WebCryptoAPI/generateKey/test_failures_AES-CTR.html b/WebCryptoAPI/generateKey/test_failures_AES-CTR.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() for Failures</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="failures.js"></script>
+
+<h1>generateKey Tests for Bad Parameters</h1>
+
+<div id="log"></div>
+<script>
+run_test(["AES-CTR"]);
+</script>
diff --git a/WebCryptoAPI/generateKey/test_failures_AES-GCM.html b/WebCryptoAPI/generateKey/test_failures_AES-GCM.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() for Failures</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="failures.js"></script>
+
+<h1>generateKey Tests for Bad Parameters</h1>
+
+<div id="log"></div>
+<script>
+run_test(["AES-GCM"]);
+</script>
diff --git a/WebCryptoAPI/generateKey/test_failures_AES-KW.html b/WebCryptoAPI/generateKey/test_failures_AES-KW.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() for Failures</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="failures.js"></script>
+
+<h1>generateKey Tests for Bad Parameters</h1>
+
+<div id="log"></div>
+<script>
+run_test(["AES-KW"]);
+</script>
diff --git a/WebCryptoAPI/generateKey/test_failures_ECDH.html b/WebCryptoAPI/generateKey/test_failures_ECDH.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() for Failures</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="failures.js"></script>
+
+<h1>generateKey Tests for Bad Parameters</h1>
+
+<div id="log"></div>
+<script>
+run_test(["ECDH"]);
+</script>
diff --git a/WebCryptoAPI/generateKey/test_failures_ECDSA.html b/WebCryptoAPI/generateKey/test_failures_ECDSA.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() for Failures</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="failures.js"></script>
+
+<h1>generateKey Tests for Bad Parameters</h1>
+
+<div id="log"></div>
+<script>
+run_test(["ECDSA"]);
+</script>
diff --git a/WebCryptoAPI/generateKey/test_failures_HMAC.html b/WebCryptoAPI/generateKey/test_failures_HMAC.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>WebCryptoAPI: generateKey() for Failures</title>
+<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
+<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="/WebCryptoAPI/util/helpers.js"></script>
+<script src="failures.js"></script>
+
+<h1>generateKey Tests for Bad Parameters</h1>
+
+<div id="log"></div>
+<script>
+run_test(["HMAC"]);
+</script>