Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(589)

Unified Diff: LayoutTests/crypto/subtle/clone-pbkdf2Key.html

Issue 820523003: [webcrypto] Implement PBKDF2 (blink-side) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: nit Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/TestExpectations ('k') | LayoutTests/crypto/subtle/clone-pbkdf2Key-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/crypto/subtle/clone-pbkdf2Key.html
diff --git a/LayoutTests/crypto/subtle/clone-hkdfKey.html b/LayoutTests/crypto/subtle/clone-pbkdf2Key.html
similarity index 81%
copy from LayoutTests/crypto/subtle/clone-hkdfKey.html
copy to LayoutTests/crypto/subtle/clone-pbkdf2Key.html
index fc59d108eeb8dcdcc4b70071c00813f9e9a26cbc..a70c221e5ff9cb49f6a1bc73a1b84e457fc54c8d 100644
--- a/LayoutTests/crypto/subtle/clone-hkdfKey.html
+++ b/LayoutTests/crypto/subtle/clone-pbkdf2Key.html
@@ -9,47 +9,48 @@
<div id="console"></div>
<script>
-description("Tests structured cloning of HKDF keys");
+description("Tests structured cloning of PBKDF2 keys");
jsTestIsAsync = true;
-// Tests the 18 permutations of keys generated by:
+// Tests the 27 permutations of keys generated by:
// kPossibleHashAlgorithms x kPossibleKeyUsages x kPossibleKeyData
//
// For practical reasons these tests are not exhaustive.
-var k128BitData = "30112233445566778899aabbccddeeff"
-var k256BitData = "00112233445546778899aabbccddeeff000102030405060708090a0b0c0d0e0f";
+var k1ByteData = "30"
+var k8ByteData = "0011223344554677";
+var k11ByteData = "00112233445546778899aa";
var kPossibleHashAlgorithms = ['SHA-1', 'SHA-256', 'SHA-512'];
var kPossibleKeyUsages = [['deriveBits'], ['deriveKey'], ['deriveKey', 'deriveBits']];
var kPossibleKeyData = [
- k128BitData,
- k256BitData
+ k1ByteData,
+ k8ByteData,
+ k11ByteData
];
function runTest(hashName, keyUsages, keyData)
{
var importData = hexStringToUint8Array(keyData);
- var importAlgorithm = { name: 'HKDF', hash: {name: hashName } };
+ var importAlgorithm = { name: 'PBKDF2', hash: {name: hashName } };
+ var extractable = false;
var results = {};
- var extractable = false;
return crypto.subtle.importKey('raw', importData, importAlgorithm, extractable, keyUsages).then(function(importedKey) {
results.importedKey = importedKey;
importedKey.extraProperty = 'hi';
return cloneKey(importedKey);
}).then(function(result) {
results.clonedKey = result;
-
importedKey = results.importedKey;
clonedKey = results.clonedKey;
shouldEvaluateAs("importedKey.extraProperty", "hi");
shouldEvaluateAs("importedKey.type", "secret");
shouldEvaluateAs("importedKey.extractable", extractable);
- shouldEvaluateAs("importedKey.algorithm.name", "HKDF");
+ shouldEvaluateAs("importedKey.algorithm.name", "PBKDF2");
shouldEvaluateAs("importedKey.usages.join(',')", keyUsages.join(","));
shouldNotBe("importedKey", "clonedKey");
@@ -57,7 +58,7 @@ function runTest(hashName, keyUsages, keyData)
shouldBeUndefined("clonedKey.extraProperty");
shouldEvaluateAs("clonedKey.type", "secret");
shouldEvaluateAs("clonedKey.extractable", extractable);
- shouldEvaluateAs("clonedKey.algorithm.name", "HKDF");
+ shouldEvaluateAs("clonedKey.algorithm.name", "PBKDF2");
shouldEvaluateAs("clonedKey.usages.join(',')", keyUsages.join(","));
logSerializedKey(importedKey);
« no previous file with comments | « LayoutTests/TestExpectations ('k') | LayoutTests/crypto/subtle/clone-pbkdf2Key-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698