mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-28 21:28:55 +00:00
Bug 1085369 - Move other long-running tests to separate test files r=keeler
This commit is contained in:
Tim Taubert
parent
73d0b18acc
commit
a281818e46
@ -11,6 +11,8 @@ support-files =
|
||||
[test_WebCrypto_DH.html]
|
||||
[test_WebCrypto_ECDH.html]
|
||||
[test_WebCrypto_JWK.html]
|
||||
[test_WebCrypto_Normalize.html]
|
||||
[test_WebCrypto_PBKDF2.html]
|
||||
[test_WebCrypto_Reject_Generating_Keys_Without_Usages.html]
|
||||
[test_WebCrypto_RSA_OAEP.html]
|
||||
[test_WebCrypto_Wrap_Unwrap.html]
|
||||
|
||||
@ -968,41 +968,6 @@ TestArray.addTest(
|
||||
}
|
||||
);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
TestArray.addTest(
|
||||
"Test that we properly normalize algorithm names",
|
||||
function() {
|
||||
var that = this;
|
||||
var alg = { name: "hmac", hash: {name: "sHa-256"} };
|
||||
|
||||
function doGenerateAesKey() {
|
||||
var alg = { name: "AES-gcm", length: 192 };
|
||||
return crypto.subtle.generateKey(alg, false, ["encrypt"]);
|
||||
}
|
||||
|
||||
function doGenerateRsaOaepKey() {
|
||||
var alg = {
|
||||
name: "rsa-OAEP",
|
||||
hash: "sha-1",
|
||||
modulusLength: 2048,
|
||||
publicExponent: new Uint8Array([0x01, 0x00, 0x01])
|
||||
};
|
||||
return crypto.subtle.generateKey(alg, false, ["encrypt", "decrypt"]);
|
||||
}
|
||||
|
||||
function doGenerateRsaSsaPkcs1Key() {
|
||||
var alg = { name: "RSASSA-pkcs1-V1_5", hash: "SHA-1" };
|
||||
return crypto.subtle.importKey("pkcs8", tv.pkcs8, alg, true, ["sign"]);
|
||||
}
|
||||
|
||||
crypto.subtle.generateKey(alg, false, ["sign"])
|
||||
.then(doGenerateAesKey)
|
||||
.then(doGenerateRsaOaepKey)
|
||||
.then(doGenerateRsaSsaPkcs1Key)
|
||||
.then(complete(that), error(that));
|
||||
}
|
||||
);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
TestArray.addTest(
|
||||
"Test that we check keys before using them for encryption/signatures",
|
||||
@ -1022,32 +987,6 @@ TestArray.addTest(
|
||||
doCheckRSASSA().then(error(that), complete(that));
|
||||
}
|
||||
);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
TestArray.addTest(
|
||||
"Test that we reject generating keys without any usage",
|
||||
function() {
|
||||
var that = this;
|
||||
var alg = {
|
||||
name: "RSA-OAEP",
|
||||
hash: "SHA-256",
|
||||
modulusLength: 2048,
|
||||
publicExponent: new Uint8Array([0x01, 0x00, 0x01])
|
||||
};
|
||||
|
||||
function generateKey(usages) {
|
||||
return crypto.subtle.generateKey(alg, false, usages);
|
||||
}
|
||||
|
||||
generateKey(["encrypt", "decrypt"]).then(function () {
|
||||
return generateKey(["encrypt"]);
|
||||
}).then(function () {
|
||||
return generateKey(["decrypt"]);
|
||||
}).then(function () {
|
||||
return generateKey(["sign"])
|
||||
}, error(that)).then(error(that), complete(that));
|
||||
}
|
||||
);
|
||||
/*]]>*/</script>
|
||||
</head>
|
||||
|
||||
|
||||
93
dom/crypto/test/test_WebCrypto_Normalize.html
Normal file
93
dom/crypto/test/test_WebCrypto_Normalize.html
Normal file
@ -0,0 +1,93 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<title>WebCrypto Test Suite</title>
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||
<link rel="stylesheet" href="./test_WebCrypto.css"/>
|
||||
<script src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
|
||||
<!-- Utilities for manipulating ABVs -->
|
||||
<script src="util.js"></script>
|
||||
|
||||
<!-- A simple wrapper around IndexedDB -->
|
||||
<script src="simpledb.js"></script>
|
||||
|
||||
<!-- Test vectors drawn from the literature -->
|
||||
<script src="./test-vectors.js"></script>
|
||||
|
||||
<!-- General testing framework -->
|
||||
<script src="./test-array.js"></script>
|
||||
|
||||
<script>/*<![CDATA[*/
|
||||
"use strict";
|
||||
|
||||
TestArray.addTest(
|
||||
"Test that we properly normalize algorithm names",
|
||||
function() {
|
||||
var that = this;
|
||||
var alg = { name: "hmac", hash: {name: "sHa-256"} };
|
||||
|
||||
function doGenerateAesKey() {
|
||||
var alg = { name: "AES-gcm", length: 192 };
|
||||
return crypto.subtle.generateKey(alg, false, ["encrypt"]);
|
||||
}
|
||||
|
||||
function doGenerateRsaOaepKey() {
|
||||
var alg = {
|
||||
name: "rsa-OAEP",
|
||||
hash: "sha-1",
|
||||
modulusLength: 2048,
|
||||
publicExponent: new Uint8Array([0x01, 0x00, 0x01])
|
||||
};
|
||||
return crypto.subtle.generateKey(alg, false, ["encrypt", "decrypt"]);
|
||||
}
|
||||
|
||||
function doGenerateRsaSsaPkcs1Key() {
|
||||
var alg = { name: "RSASSA-pkcs1-V1_5", hash: "SHA-1" };
|
||||
return crypto.subtle.importKey("pkcs8", tv.pkcs8, alg, true, ["sign"]);
|
||||
}
|
||||
|
||||
crypto.subtle.generateKey(alg, false, ["sign"])
|
||||
.then(doGenerateAesKey)
|
||||
.then(doGenerateRsaOaepKey)
|
||||
.then(doGenerateRsaSsaPkcs1Key)
|
||||
.then(complete(that), error(that));
|
||||
}
|
||||
);
|
||||
|
||||
/*]]>*/</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="content">
|
||||
<div id="head">
|
||||
<b>Web</b>Crypto<br>
|
||||
</div>
|
||||
|
||||
<div id="start" onclick="start();">RUN ALL</div>
|
||||
|
||||
<div id="resultDiv" class="content">
|
||||
Summary:
|
||||
<span class="pass"><span id="passN">0</span> passed, </span>
|
||||
<span class="fail"><span id="failN">0</span> failed, </span>
|
||||
<span class="pending"><span id="pendingN">0</span> pending.</span>
|
||||
<br/>
|
||||
<br/>
|
||||
|
||||
<table id="results">
|
||||
<tr>
|
||||
<th>Test</th>
|
||||
<th>Result</th>
|
||||
<th>Time</th>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="foot"></div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,83 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<title>WebCrypto Test Suite</title>
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||
<link rel="stylesheet" href="./test_WebCrypto.css"/>
|
||||
<script src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
|
||||
<!-- Utilities for manipulating ABVs -->
|
||||
<script src="util.js"></script>
|
||||
|
||||
<!-- A simple wrapper around IndexedDB -->
|
||||
<script src="simpledb.js"></script>
|
||||
|
||||
<!-- Test vectors drawn from the literature -->
|
||||
<script src="./test-vectors.js"></script>
|
||||
|
||||
<!-- General testing framework -->
|
||||
<script src="./test-array.js"></script>
|
||||
|
||||
<script>/*<![CDATA[*/
|
||||
"use strict";
|
||||
|
||||
TestArray.addTest(
|
||||
"Test that we reject generating keys without any usage",
|
||||
function() {
|
||||
var that = this;
|
||||
var alg = {
|
||||
name: "RSA-OAEP",
|
||||
hash: "SHA-256",
|
||||
modulusLength: 2048,
|
||||
publicExponent: new Uint8Array([0x01, 0x00, 0x01])
|
||||
};
|
||||
|
||||
function generateKey(usages) {
|
||||
return crypto.subtle.generateKey(alg, false, usages);
|
||||
}
|
||||
|
||||
generateKey(["encrypt", "decrypt"]).then(function () {
|
||||
return generateKey(["encrypt"]);
|
||||
}).then(function () {
|
||||
return generateKey(["decrypt"]);
|
||||
}).then(function () {
|
||||
return generateKey(["sign"])
|
||||
}, error(that)).then(error(that), complete(that));
|
||||
}
|
||||
);
|
||||
/*]]>*/</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="content">
|
||||
<div id="head">
|
||||
<b>Web</b>Crypto<br>
|
||||
</div>
|
||||
|
||||
<div id="start" onclick="start();">RUN ALL</div>
|
||||
|
||||
<div id="resultDiv" class="content">
|
||||
Summary:
|
||||
<span class="pass"><span id="passN">0</span> passed, </span>
|
||||
<span class="fail"><span id="failN">0</span> failed, </span>
|
||||
<span class="pending"><span id="pendingN">0</span> pending.</span>
|
||||
<br/>
|
||||
<br/>
|
||||
|
||||
<table id="results">
|
||||
<tr>
|
||||
<th>Test</th>
|
||||
<th>Result</th>
|
||||
<th>Time</th>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="foot"></div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Loading…
x
Reference in New Issue
Block a user