Skip to content
Permalink
Browse files
[WebCrypto] Migrate some tests from webkitSubtle to subtle
https://bugs.webkit.org/show_bug.cgi?id=165554

Reviewed by Brent Fulgham.

To improve test coverage for subtle.

* crypto/crypto-key-algorithm-gc-expected.txt: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-algorithm-gc-expected.txt.
* crypto/crypto-key-algorithm-gc.html: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-algorithm-gc.html.
* crypto/crypto-key-usages-gc-expected.txt: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-usages-gc-expected.txt.
* crypto/crypto-key-usages-gc.html: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-usages-gc.html.
* crypto/subtle/resources/rsa-indexeddb-non-exportable.js: Added.
* crypto/subtle/resources/rsa-indexeddb.js: Added.
* crypto/subtle/rsa-indexeddb-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-non-exportable-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-non-exportable-private-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-non-exportable-private.html: Added.
* crypto/subtle/rsa-indexeddb-non-exportable.html: Added.
* crypto/subtle/rsa-indexeddb-private-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-private.html: Added.
* crypto/subtle/rsa-indexeddb.html: Added.
* crypto/subtle/rsa-oaep-plaintext-length-expected.txt: Added.
* crypto/subtle/rsa-oaep-plaintext-length.html: Added.
* crypto/subtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent-expected.txt: Added.
* crypto/subtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent.html: Added.
* platform/ios-simulator-wk1/TestExpectations:

Canonical link: https://commits.webkit.org/183395@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Jiewen Tan committed Dec 13, 2016
1 parent 366ae5f commit c1e367d02818b87192f02aed03e98f1a677b22b3
Showing 20 changed files with 398 additions and 8 deletions.
@@ -1,3 +1,32 @@
2016-12-07 Jiewen Tan <jiewen_tan@apple.com>

[WebCrypto] Migrate some tests from webkitSubtle to subtle
https://bugs.webkit.org/show_bug.cgi?id=165554

Reviewed by Brent Fulgham.

To improve test coverage for subtle.

* crypto/crypto-key-algorithm-gc-expected.txt: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-algorithm-gc-expected.txt.
* crypto/crypto-key-algorithm-gc.html: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-algorithm-gc.html.
* crypto/crypto-key-usages-gc-expected.txt: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-usages-gc-expected.txt.
* crypto/crypto-key-usages-gc.html: Renamed from LayoutTests/crypto/webkitSubtle/crypto-key-usages-gc.html.
* crypto/subtle/resources/rsa-indexeddb-non-exportable.js: Added.
* crypto/subtle/resources/rsa-indexeddb.js: Added.
* crypto/subtle/rsa-indexeddb-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-non-exportable-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-non-exportable-private-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-non-exportable-private.html: Added.
* crypto/subtle/rsa-indexeddb-non-exportable.html: Added.
* crypto/subtle/rsa-indexeddb-private-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-private.html: Added.
* crypto/subtle/rsa-indexeddb.html: Added.
* crypto/subtle/rsa-oaep-plaintext-length-expected.txt: Added.
* crypto/subtle/rsa-oaep-plaintext-length.html: Added.
* crypto/subtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent-expected.txt: Added.
* crypto/subtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent.html: Added.
* platform/ios-simulator-wk1/TestExpectations:

2016-12-12 Matt Baker <mattbaker@apple.com>

Unreviewed, follow-up after r209706.
@@ -2,8 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<script src="../../resources/js-test-pre.js"></script>
<script src="../resources/common.js"></script>
<script src="../resources/js-test-pre.js"></script>
<script src="resources/common.js"></script>
</head>
<body>
<script>
@@ -12,7 +12,7 @@
jsTestIsAsync = true;

debug("\nGenerating a HMAC key with default length...");
crypto.webkitSubtle.generateKey({name: "hmac", hash: "sha-1"}, true, ["sign", "verify"]).then(function(result) {
crypto.subtle.generateKey({name: "hmac", hash: "sha-1"}, true, ["sign", "verify"]).then(function(result) {
key = result;
startTest();
});
@@ -39,6 +39,6 @@
}

</script>
<script src="../../resources/js-test-post.js"></script>
<script src="../resources/js-test-post.js"></script>
</body>
</html>
@@ -2,8 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<script src="../../resources/js-test-pre.js"></script>
<script src="../resources/common.js"></script>
<script src="../resources/js-test-pre.js"></script>
<script src="resources/common.js"></script>
</head>
<body>
<script>
@@ -12,7 +12,7 @@
jsTestIsAsync = true;

debug("\nGenerating a HMAC key with default length...");
crypto.webkitSubtle.generateKey({name: "hmac", hash: "sha-1"}, true, ["sign", "verify"]).then(function(result) {
crypto.subtle.generateKey({name: "hmac", hash: "sha-1"}, true, ["sign", "verify"]).then(function(result) {
key = result;
startTest();
});
@@ -39,6 +39,6 @@
}

</script>
<script src="../../resources/js-test-post.js"></script>
<script src="../resources/js-test-post.js"></script>
</body>
</html>
@@ -0,0 +1,62 @@
description("Test storing a private RSA key in IndexedDB, and retrieving it.");

jsTestIsAsync = true;

var privateKeyJSON = {
kty: "RSA",
alg: "RS256",
n: "rcCUCv7Oc1HVam1DIhCzqknThWawOp8QLk8Ziy2p10ByjQFCajoFiyuAWl-R1WXZaf4xitLRracT9agpzIzc-MbLSHIGgWQGO21lGiImy5ftZ-D8bHAqRz2y15pzD4c4CEou7XSSLDoRnR0QG5MsDhD6s2gV9mwHkrtkCxtMWdBi-77as8wGmlNRldcOSgZDLK8UnCSgA1OguZ989bFyc8tOOEIb0xUSfPSz3LPSCnyYz68aDjmKVeNH-ig857OScyWbGyEy3Biw64qun3juUlNWsJ3zngkOdteYWytx5Qr4XKNs6R-Myyq72KUp02mJDZiiyiglxML_i3-_CeecCw",
e: "AQAB",
d: "eNLS37aCz7RXSNPD_DtLBJ6j5T8cSxdzRBCjPaI6WcGqJp16lq3UTwuoDLAqlA9oGYm238dsIWpuucP_lQtbWe-7SpxoI6_vmYGf7YVUHv1-DF9qiOmSrMmdxMnVOzYXY8RaT6thPjn_J5cfLV2xI_LwsrMtmpdSyNlgX0zTUhwtuahgAKMEChYjH2EnjHdHw6sY2-wApdcQI7ULE0oo5RzbQZpmuhcN9hiBc0L3hhF0qo50mbl02_65_GQ7DpVkXBxNgRBLzlPabmzzG2oAhfefLgYmSC1opaCkXE6vRWQNWNL45RZNZFYM3uoJghOMqGeocM0BpjdChHrPOlFvSQ",
p: "4miTuAjKMeH5uJ5KB397QUwhbkYEgSbcA2mifmSkvE2018gb55qkBHK1eVryf1_m43LNlc6O_ak6gfzdZIZvS5NCGjPl0q09plUpu8qFOSspBwA67qGH76lFlZLn_d4yglS7wfLru4_5Ys8qLLs-DqVLviwposOnyyWqwM5AXp0",
q: "xHYrzkivtmnz_sGchnWGc0q-pDOkKicptRpv2pMFIIXxnFX5aMeEXIZjVujXtwUy1UlFIN2GZJSvy5KJ79mu_XyNnFHMzedH-A3ee3u8h1UUrZF-vUu1_e4U_x67NN1dedzUSKynN7pFl3OkuShMBWGV-cwzOPdcVAfVuZlxUMc",
dp: "fBzDzYDUBmBQGop7Hn0dvf_T27V6RqpctWo074CQZcFbP2atFVtKSj3viWT3xid2VHzcgiDHdfpM3nEVlEO1wwIonGCSvdjGEOZiiFVOjrZAOVxA8guOjyyFvqbXke06VwPIIVvfKeSU2zuhbP__1tt6F_fxow4Kb2xonGT0GGk",
dq: "jmE2DiIPdhwDgLXAQpIaBqQ81bO3XfVT_LRULAwwwwlPuQV148H04zlh9TJ6Y2GZHYokV1U0eOBpJxfkb7dLYtpJpuiBjRf4yIUEoGlkkI_QlJnFSFr-YjGRdfNHqWBkxlSMZL770R9mIATndGkH7z5x-r9KwBZFC4FCG2hg_zE",
qi: "YCX_pLwbMBA1ThVH0WcwmnytqNcrMCEwTm7ByA2eU6nWbQrULvf7m9_kzfLUcjsnpAVlBQG5JMXMy0Sq4ptwbywsa5-G8KAOOOR2L3v4hC-Eys9ftgFM_3i0o40eeQH4b3haPbntrIeMg8IzlOuVYKf9-2QuKDoWeRdd7NsdxTk"
};

crypto.subtle.importKey("jwk", privateKeyJSON, { name: 'RSASSA-PKCS1-v1_5', hash: "sha-256" }, false, ["sign"]).then(function(key) {
var openRequest = indexedDB.open("crypto_subtle");
openRequest.onupgradeneeded = function(event) {
var objectStore = event.target.result.createObjectStore("rsa-indexeddb");
}
openRequest.onerror = function(event) {
testFailed("Could not open database: " + event.target.error.name);
finishJSTest();
}
openRequest.onsuccess = function(event) {
db = event.target.result;
storeKey();
}

function storeKey() {
var objectStore = db.transaction("rsa-indexeddb", "readwrite").objectStore("rsa-indexeddb");
var req = objectStore.put(key, "mykey");
req.onerror = function(event) {
testFailed("Could not put a key into database: " + event.target.error.name);
finishJSTest();
}
req.onsuccess = function(event) { readKey(); }
}

function readKey() {
var objectStore = db.transaction("rsa-indexeddb").objectStore("rsa-indexeddb");
var req = objectStore.get("mykey");
req.onerror = function(event) {
testFailed("Could not get a key from database: " + event.target.error.name);
finishJSTest();
}
req.onsuccess = function(event) {
window.retrievedKey = event.target.result;
shouldBe("retrievedKey.type", "'private'");
shouldBe("retrievedKey.extractable", "false");
shouldBe("retrievedKey.algorithm.name", "'RSASSA-PKCS1-v1_5'");
shouldBe("retrievedKey.algorithm.modulusLength", "2048");
shouldBe("bytesToHexString(retrievedKey.algorithm.publicExponent)", "'010001'");
shouldBe("retrievedKey.algorithm.hash.name", "'SHA-256'");
shouldBe("retrievedKey.usages", '["sign"]');

finishJSTest();
}
}
});
@@ -0,0 +1,62 @@
description("Test storing a private RSA key in IndexedDB, and retrieving it.");

jsTestIsAsync = true;

var privateKeyJSON = {
kty: "RSA",
alg: "RS256",
n: "rcCUCv7Oc1HVam1DIhCzqknThWawOp8QLk8Ziy2p10ByjQFCajoFiyuAWl-R1WXZaf4xitLRracT9agpzIzc-MbLSHIGgWQGO21lGiImy5ftZ-D8bHAqRz2y15pzD4c4CEou7XSSLDoRnR0QG5MsDhD6s2gV9mwHkrtkCxtMWdBi-77as8wGmlNRldcOSgZDLK8UnCSgA1OguZ989bFyc8tOOEIb0xUSfPSz3LPSCnyYz68aDjmKVeNH-ig857OScyWbGyEy3Biw64qun3juUlNWsJ3zngkOdteYWytx5Qr4XKNs6R-Myyq72KUp02mJDZiiyiglxML_i3-_CeecCw",
e: "AQAB",
d: "eNLS37aCz7RXSNPD_DtLBJ6j5T8cSxdzRBCjPaI6WcGqJp16lq3UTwuoDLAqlA9oGYm238dsIWpuucP_lQtbWe-7SpxoI6_vmYGf7YVUHv1-DF9qiOmSrMmdxMnVOzYXY8RaT6thPjn_J5cfLV2xI_LwsrMtmpdSyNlgX0zTUhwtuahgAKMEChYjH2EnjHdHw6sY2-wApdcQI7ULE0oo5RzbQZpmuhcN9hiBc0L3hhF0qo50mbl02_65_GQ7DpVkXBxNgRBLzlPabmzzG2oAhfefLgYmSC1opaCkXE6vRWQNWNL45RZNZFYM3uoJghOMqGeocM0BpjdChHrPOlFvSQ",
p: "4miTuAjKMeH5uJ5KB397QUwhbkYEgSbcA2mifmSkvE2018gb55qkBHK1eVryf1_m43LNlc6O_ak6gfzdZIZvS5NCGjPl0q09plUpu8qFOSspBwA67qGH76lFlZLn_d4yglS7wfLru4_5Ys8qLLs-DqVLviwposOnyyWqwM5AXp0",
q: "xHYrzkivtmnz_sGchnWGc0q-pDOkKicptRpv2pMFIIXxnFX5aMeEXIZjVujXtwUy1UlFIN2GZJSvy5KJ79mu_XyNnFHMzedH-A3ee3u8h1UUrZF-vUu1_e4U_x67NN1dedzUSKynN7pFl3OkuShMBWGV-cwzOPdcVAfVuZlxUMc",
dp: "fBzDzYDUBmBQGop7Hn0dvf_T27V6RqpctWo074CQZcFbP2atFVtKSj3viWT3xid2VHzcgiDHdfpM3nEVlEO1wwIonGCSvdjGEOZiiFVOjrZAOVxA8guOjyyFvqbXke06VwPIIVvfKeSU2zuhbP__1tt6F_fxow4Kb2xonGT0GGk",
dq: "jmE2DiIPdhwDgLXAQpIaBqQ81bO3XfVT_LRULAwwwwlPuQV148H04zlh9TJ6Y2GZHYokV1U0eOBpJxfkb7dLYtpJpuiBjRf4yIUEoGlkkI_QlJnFSFr-YjGRdfNHqWBkxlSMZL770R9mIATndGkH7z5x-r9KwBZFC4FCG2hg_zE",
qi: "YCX_pLwbMBA1ThVH0WcwmnytqNcrMCEwTm7ByA2eU6nWbQrULvf7m9_kzfLUcjsnpAVlBQG5JMXMy0Sq4ptwbywsa5-G8KAOOOR2L3v4hC-Eys9ftgFM_3i0o40eeQH4b3haPbntrIeMg8IzlOuVYKf9-2QuKDoWeRdd7NsdxTk"
};

crypto.subtle.importKey("jwk", privateKeyJSON, { name: 'RSASSA-PKCS1-v1_5', hash: "sha-256" }, true, ["sign"]).then(function(key) {
var openRequest = indexedDB.open("crypto_subtle");
openRequest.onupgradeneeded = function(event) {
var objectStore = event.target.result.createObjectStore("rsa-indexeddb");
}
openRequest.onerror = function(event) {
testFailed("Could not open database: " + event.target.error.name);
finishJSTest();
}
openRequest.onsuccess = function(event) {
db = event.target.result;
storeKey();
}

function storeKey() {
var objectStore = db.transaction("rsa-indexeddb", "readwrite").objectStore("rsa-indexeddb");
var req = objectStore.put(key, "mykey");
req.onerror = function(event) {
testFailed("Could not put a key into database: " + event.target.error.name);
finishJSTest();
}
req.onsuccess = function(event) { readKey(); }
}

function readKey() {
var objectStore = db.transaction("rsa-indexeddb").objectStore("rsa-indexeddb");
var req = objectStore.get("mykey");
req.onerror = function(event) {
testFailed("Could not get a key from database: " + event.target.error.name);
finishJSTest();
}
req.onsuccess = function(event) {
window.retrievedKey = event.target.result;
shouldBe("retrievedKey.type", "'private'");
shouldBe("retrievedKey.extractable", "true");
shouldBe("retrievedKey.algorithm.name", "'RSASSA-PKCS1-v1_5'");
shouldBe("retrievedKey.algorithm.modulusLength", "2048");
shouldBe("bytesToHexString(retrievedKey.algorithm.publicExponent)", "'010001'");
shouldBe("retrievedKey.algorithm.hash.name", "'SHA-256'");
shouldBe("retrievedKey.usages", '["sign"]');

finishJSTest();
}
}
}, failAndFinishJSTest);
@@ -0,0 +1,16 @@
Test storing a private RSA key in IndexedDB, and retrieving it.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


PASS retrievedKey.type is 'private'
PASS retrievedKey.extractable is true
PASS retrievedKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
PASS retrievedKey.algorithm.modulusLength is 2048
PASS bytesToHexString(retrievedKey.algorithm.publicExponent) is '010001'
PASS retrievedKey.algorithm.hash.name is 'SHA-256'
PASS retrievedKey.usages is ["sign"]
PASS successfullyParsed is true

TEST COMPLETE

@@ -0,0 +1,16 @@
Test storing a private RSA key in IndexedDB, and retrieving it.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


PASS retrievedKey.type is 'private'
PASS retrievedKey.extractable is false
PASS retrievedKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
PASS retrievedKey.algorithm.modulusLength is 2048
PASS bytesToHexString(retrievedKey.algorithm.publicExponent) is '010001'
PASS retrievedKey.algorithm.hash.name is 'SHA-256'
PASS retrievedKey.usages is ["sign"]
PASS successfullyParsed is true

TEST COMPLETE

@@ -0,0 +1,16 @@
Test storing a private RSA key in IndexedDB, and retrieving it.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


PASS retrievedKey.type is 'private'
PASS retrievedKey.extractable is false
PASS retrievedKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
PASS retrievedKey.algorithm.modulusLength is 2048
PASS bytesToHexString(retrievedKey.algorithm.publicExponent) is '010001'
PASS retrievedKey.algorithm.hash.name is 'SHA-256'
PASS retrievedKey.usages is ["sign"]
PASS successfullyParsed is true

TEST COMPLETE

@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<script>
enablePrivateBrowsing = true;
</script>
<script src="../../resources/js-test-pre.js"></script>
<script src="../resources/common.js"></script>
</head>
<body>
<script src="resources/rsa-indexeddb-non-exportable.js"></script>
<script src="../../resources/js-test-post.js"></script>
</body>
</html>
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<script src="../../resources/js-test-pre.js"></script>
<script src="../resources/common.js"></script>
</head>
<body>
<script src="resources/rsa-indexeddb-non-exportable.js"></script>
<script src="../../resources/js-test-post.js"></script>
</body>
</html>
@@ -0,0 +1,16 @@
Test storing a private RSA key in IndexedDB, and retrieving it.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


PASS retrievedKey.type is 'private'
PASS retrievedKey.extractable is true
PASS retrievedKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
PASS retrievedKey.algorithm.modulusLength is 2048
PASS bytesToHexString(retrievedKey.algorithm.publicExponent) is '010001'
PASS retrievedKey.algorithm.hash.name is 'SHA-256'
PASS retrievedKey.usages is ["sign"]
PASS successfullyParsed is true

TEST COMPLETE

@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<script>
enablePrivateBrowsing = true;
</script>
<script src="../../resources/js-test-pre.js"></script>
<script src="../resources/common.js"></script>
</head>
<body>
<script src="resources/rsa-indexeddb.js"></script>
<script src="../../resources/js-test-post.js"></script>
</body>
</html>
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<script src="../../resources/js-test-pre.js"></script>
<script src="../resources/common.js"></script>
</head>
<body>
<script src="resources/rsa-indexeddb.js"></script>
<script src="../../resources/js-test-post.js"></script>
</body>
</html>
@@ -0,0 +1,14 @@
Test what happens when trying to encrypt a too large plain text with RSA-OAEP.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


Importing RSA keys...
Encrypting a 214 byte buffer with RSA-OAEP SHA-1, 2048 bit key...
PASS Succeeded
Encrypting a 215 byte buffer...
PASS Rejected
PASS successfullyParsed is true

TEST COMPLETE

@@ -0,0 +1,46 @@
<!DOCTYPE html>
<html>
<head>
<script src="../../resources/js-test-pre.js"></script>
<script src="../resources/common.js"></script>
</head>
<body>
<p id="description"></p>
<div id="console"></div>

<script>
description("Test what happens when trying to encrypt a too large plain text with RSA-OAEP.");

jsTestIsAsync = true;

var publicKeyJSON = {
kty: "RSA",
alg: "RSA-OAEP",
n: "rcCUCv7Oc1HVam1DIhCzqknThWawOp8QLk8Ziy2p10ByjQFCajoFiyuAWl-R1WXZaf4xitLRracT9agpzIzc-MbLSHIGgWQGO21lGiImy5ftZ-D8bHAqRz2y15pzD4c4CEou7XSSLDoRnR0QG5MsDhD6s2gV9mwHkrtkCxtMWdBi-77as8wGmlNRldcOSgZDLK8UnCSgA1OguZ989bFyc8tOOEIb0xUSfPSz3LPSCnyYz68aDjmKVeNH-ig857OScyWbGyEy3Biw64qun3juUlNWsJ3zngkOdteYWytx5Qr4XKNs6R-Myyq72KUp02mJDZiiyiglxML_i3-_CeecCw",
e: "AQAB"
};

var extractable = true;

debug("Importing RSA keys...");
crypto.subtle.importKey("jwk", publicKeyJSON, {name: "RSA-OAEP", hash: "sha-1"}, extractable, ["encrypt"]).then(function(result) {
publicKey = result;

debug("Encrypting a 214 byte buffer with RSA-OAEP SHA-1, 2048 bit key...");
return crypto.subtle.encrypt("RSA-OAEP", publicKey, new Uint8Array(214));
}).then(function(result) {
testPassed("Succeeded");
debug("Encrypting a 215 byte buffer...");
return crypto.subtle.encrypt("RSA-OAEP", publicKey, new Uint8Array(215));
}).then(function(result) {
testFailed("Succeeded");
finishJSTest();
}, function(result) {
testPassed("Rejected");
finishJSTest();
});
</script>

<script src="../../resources/js-test-post.js"></script>
</body>
</html>

0 comments on commit c1e367d

Please sign in to comment.