| Index: LayoutTests/crypto/wrapKey-lacks-usage.html
|
| diff --git a/LayoutTests/crypto/aes-key-algorithm-mismatch.html b/LayoutTests/crypto/wrapKey-lacks-usage.html
|
| similarity index 36%
|
| copy from LayoutTests/crypto/aes-key-algorithm-mismatch.html
|
| copy to LayoutTests/crypto/wrapKey-lacks-usage.html
|
| index 9d97be3c1f1b0cac349a5e49617c9a8269fbc064..09a35aa251cc4883964190f708cc576c31c28c0d 100644
|
| --- a/LayoutTests/crypto/aes-key-algorithm-mismatch.html
|
| +++ b/LayoutTests/crypto/wrapKey-lacks-usage.html
|
| @@ -9,26 +9,36 @@
|
| <div id="console"></div>
|
|
|
| <script>
|
| -description("Call encrypt using the wrong AES key");
|
| +description("Tests that wrapping keys must have the 'wrapKey' usage.");
|
|
|
| jsTestIsAsync = true;
|
|
|
| -var keyData = hexStringToUint8Array("2b7e151628aed2a6abf7158809cf4f3c");
|
| -var data = asciiToUint8Array("hello");
|
| -var aesCbcKey = null;
|
| +function importWrappingKey()
|
| +{
|
| + var data = new Uint8Array(16);
|
| + var extractable = true;
|
| + var keyUsages = ['encrypt'];
|
|
|
| -Promise.resolve(null).then(function(result) {
|
| - var usages = ['encrypt', 'decrypt'];
|
| - var extractable = false;
|
| - var algorithm = {name: 'aes-gcm'};
|
| + 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;
|
| - shouldEvaluateAs("key.algorithm.name", "AES-GCM");
|
| + wrapAlgorithm = {name: 'aes-cbc', iv: new Uint8Array(16)};
|
|
|
| - // Can't use an AES-KW key for AES-CBC (even though both are AES keys).
|
| - return crypto.subtle.encrypt({name: 'AES-CBC', iv: new Uint8Array(16)}, key, data);
|
| + return crypto.subtle.wrapKey('raw', key, wrappingKey, wrapAlgorithm);
|
| }).then(failAndFinishJSTest, function(result) {
|
| error = result;
|
| shouldBeNull("error");
|
|
|