mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Bug 1022343 - Use the hash function's block size as the default length when generating keys r=rbarnes
This commit is contained in:
parent
ade22f2f72
commit
638c326719
@ -1169,11 +1169,17 @@ public:
|
||||
} else {
|
||||
KeyAlgorithm hashAlg(global, hashName);
|
||||
switch (hashAlg.Mechanism()) {
|
||||
case CKM_SHA_1: mLength = 128; break;
|
||||
case CKM_SHA256: mLength = 256; break;
|
||||
case CKM_SHA384: mLength = 384; break;
|
||||
case CKM_SHA512: mLength = 512; break;
|
||||
default: mLength = 0; break;
|
||||
case CKM_SHA_1:
|
||||
case CKM_SHA256:
|
||||
mLength = 512;
|
||||
break;
|
||||
case CKM_SHA384:
|
||||
case CKM_SHA512:
|
||||
mLength = 1024;
|
||||
break;
|
||||
default:
|
||||
mLength = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -332,7 +332,22 @@ TestArray.addTest(
|
||||
var alg = { name: "HMAC", hash: {name: "SHA-256"} };
|
||||
crypto.subtle.generateKey(alg, true, ["sign", "verify"]).then(
|
||||
complete(that, function(x) {
|
||||
return hasKeyFields(x) && x.algorithm.length == 256;
|
||||
return hasKeyFields(x) && x.algorithm.length == 512;
|
||||
}),
|
||||
error(that)
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
TestArray.addTest(
|
||||
"Generate a 256-bit HMAC-SHA-512 key without specifying a key length",
|
||||
function() {
|
||||
var that = this;
|
||||
var alg = { name: "HMAC", hash: {name: "SHA-512"} };
|
||||
crypto.subtle.generateKey(alg, true, ["sign", "verify"]).then(
|
||||
complete(that, function(x) {
|
||||
return hasKeyFields(x) && x.algorithm.length == 1024;
|
||||
}),
|
||||
error(that)
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user