| Index: LayoutTests/crypto/wrapKey-badParameters.html
|
| diff --git a/LayoutTests/crypto/aes-ctr-parseAlgorithm-failures.html b/LayoutTests/crypto/wrapKey-badParameters.html
|
| similarity index 29%
|
| copy from LayoutTests/crypto/aes-ctr-parseAlgorithm-failures.html
|
| copy to LayoutTests/crypto/wrapKey-badParameters.html
|
| index d52f4546b26cdf018cab855f37076513c291b258..7130d0f17ac59e40729fd7a751f42a44e50006a0 100644
|
| --- a/LayoutTests/crypto/aes-ctr-parseAlgorithm-failures.html
|
| +++ b/LayoutTests/crypto/wrapKey-badParameters.html
|
| @@ -9,50 +9,61 @@
|
| <div id="console"></div>
|
|
|
| <script>
|
| -description("Tests bad algorithm inputs for AES-CTR");
|
| +description("Tests calls to wrapKey() with bad inputs.");
|
|
|
| jsTestIsAsync = true;
|
|
|
| -var keyData = hexStringToUint8Array("2b7e151628aed2a6abf7158809cf4f3c");
|
| -var data = asciiToUint8Array("hello");
|
| -var key = null;
|
| +function importWrappingKey()
|
| +{
|
| + var data = new Uint8Array(16);
|
| + var extractable = true;
|
| + var keyUsages = ['wrapKey'];
|
|
|
| -Promise.resolve(null).then(function(result) {
|
| - var usages = ['encrypt', 'decrypt'];
|
| - var extractable = false;
|
| - // FIXME: Should use aes-ctr here.
|
| - var algorithm = {name: 'aes-cbc'};
|
| + return crypto.subtle.importKey('raw', data, {name: 'AES-CBC'}, extractable, keyUsages);
|
| +}
|
|
|
| - return crypto.subtle.importKey('raw', keyData, algorithm, extractable, usages);
|
| +function importKeyToWrap()
|
| +{
|
| + var data = new Uint8Array(16);
|
| + var extractable = true;
|
| + var keyUsages = ['sign'];
|
| +
|
| + return crypto.subtle.importKey('raw', data, {name: 'HMAC', hash: {name: 'SHA-1'}}, extractable, keyUsages);
|
| +}
|
| +
|
| +importWrappingKey().then(function(result) {
|
| + wrappingKey = result;
|
| + return importKeyToWrap();
|
| }).then(function(result) {
|
| key = result;
|
|
|
| - return crypto.subtle.encrypt({name: 'AES-CTR', counter: null}, key, data);
|
| -}).then(failAndFinishJSTest, function(result) {
|
| - error = result;
|
| - shouldBeNull("error");
|
| + wrapAlgorithm = {name: 'aes-cbc', iv: new Uint8Array(16)};
|
|
|
| - return crypto.subtle.encrypt({name: 'AES-CTR'}, key, data);
|
| -}).then(failAndFinishJSTest, function(result) {
|
| - error = result;
|
| - shouldBeNull("error");
|
| + // Invalid key
|
| + shouldThrow("crypto.subtle.wrapKey('raw', 1, wrappingKey, wrapAlgorithm)");
|
|
|
| - return crypto.subtle.encrypt({name: 'AES-CTR', counter: new Uint8Array(0)}, key, data);
|
| -}).then(failAndFinishJSTest, function(result) {
|
| - error = result;
|
| - shouldBeNull("error");
|
| + // Invalid wrappingKey
|
| + shouldThrow("crypto.subtle.wrapKey('raw', key, '', wrapAlgorithm)");
|
| +
|
| + // Invalid wrapAlgorithm
|
| + shouldThrow("crypto.subtle.wrapKey('raw', key, wrappingKey, undefined)");
|
|
|
| - return crypto.subtle.encrypt({name: 'AES-CTR', counter: new Uint8Array(16), length: 256}, key, data);
|
| + // Invalid format for wrapKey
|
| + return crypto.subtle.wrapKey('bad-format', key, wrappingKey, wrapAlgorithm);
|
| }).then(failAndFinishJSTest, function(result) {
|
| error = result;
|
| shouldBeNull("error");
|
|
|
| - return crypto.subtle.encrypt({name: 'AES-CTR', counter: new Uint8Array(16), length: -3}, key, data);
|
| + // SHA-1 isn't a valid wrapKey algorithm.
|
| + return crypto.subtle.wrapKey('raw', key, wrappingKey, {name: 'SHA-1'});
|
| }).then(failAndFinishJSTest, function(result) {
|
| error = result;
|
| shouldBeNull("error");
|
|
|
| - return crypto.subtle.encrypt({name: 'AES-CTR', counter: new Uint8Array(16), length: Infinity}, key, data);
|
| + // Wrap algorithm doesn't match the wrapping key's algorithm (AES-CBC key
|
| + // with AES-CTR wrap algorithm)
|
| + aesCtrAlgorithm = {name: 'AES-CTR', counter: new Uint8Array(16), length: 0};
|
| + return crypto.subtle.wrapKey('raw', key, wrappingKey, aesCtrAlgorithm);
|
| }).then(failAndFinishJSTest, function(result) {
|
| error = result;
|
| shouldBeNull("error");
|
|
|