Skip to content

GitLab

T
tangled
Commit 384cc3ad authored by eroman@chromium.org's avatar eroman@chromium.org
Browse files
Options

[webcrypto] Some fixes for HMAC 

 * Wire up HMAC SHA224, HMAC SHA384, HMAC SHA512 for NSS.
 * When generating an HMAC key and the key length was not specified use
   the underlying block size for the key length (as this is the maximum
   length of the key). The OpenSSL version had a bug where it would not
   select the block size.
 * Fix a test which intended to check randomness.

BUG=245025

Review URL: https://codereview.chromium.org/108653015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242149 0039d316-1c4b-4281-b951-d872f2087c98
parent 04d7feb7
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 59 deletions
content/renderer/webcrypto/webcrypto_impl_nss.cc
View file @ 384cc3ad
......@@ -80,13 +80,19 @@ HASH_HashType WebCryptoAlgorithmToNSSHashType(
}
}
CK_MECHANISM_TYPE WebCryptoAlgorithmToHMACMechanism(
CK_MECHANISM_TYPE WebCryptoHashToHMACMechanism(
const blink::WebCryptoAlgorithm& algorithm) {
switch (algorithm.id()) {
case blink::WebCryptoAlgorithmIdSha1:
return CKM_SHA_1_HMAC;
case blink::WebCryptoAlgorithmIdSha224:
return CKM_SHA224_HMAC;
case blink::WebCryptoAlgorithmIdSha256:
return CKM_SHA256_HMAC;
case blink::WebCryptoAlgorithmIdSha384:
return CKM_SHA384_HMAC;
case blink::WebCryptoAlgorithmIdSha512:
return CKM_SHA512_HMAC;
default:
// Not a supported algorithm.
return CKM_INVALID_MECHANISM;
......@@ -175,49 +181,18 @@ bool AesCbcEncryptDecrypt(
return true;
}
CK_MECHANISM_TYPE HmacAlgorithmToGenMechanism(
const blink::WebCryptoAlgorithm& algorithm) {
DCHECK_EQ(algorithm.id(), blink::WebCryptoAlgorithmIdHmac);
const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams();
DCHECK(params);
switch (params->hash().id()) {
case blink::WebCryptoAlgorithmIdSha1:
return CKM_SHA_1_HMAC;
case blink::WebCryptoAlgorithmIdSha256:
return CKM_SHA256_HMAC;
default:
return CKM_INVALID_MECHANISM;
}
}
CK_MECHANISM_TYPE WebCryptoAlgorithmToGenMechanism(
const blink::WebCryptoAlgorithm& algorithm) {
switch (algorithm.id()) {
case blink::WebCryptoAlgorithmIdAesCbc:
return CKM_AES_KEY_GEN;
case blink::WebCryptoAlgorithmIdHmac:
return HmacAlgorithmToGenMechanism(algorithm);
return WebCryptoHashToHMACMechanism(algorithm.hmacKeyParams()->hash());
default:
return CKM_INVALID_MECHANISM;
}
}
// TODO(eroman): This is duplicated in OpenSSL version.
unsigned int WebCryptoHmacAlgorithmToBlockSizeBits(
const blink::WebCryptoAlgorithm& algorithm) {
DCHECK_EQ(algorithm.id(), blink::WebCryptoAlgorithmIdHmac);
const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams();
DCHECK(params);
switch (params->hash().id()) {
case blink::WebCryptoAlgorithmIdSha1:
return 512;
case blink::WebCryptoAlgorithmIdSha256:
return 512;
default:
return 0;
}
}
// Converts a (big-endian) WebCrypto BigInteger, with or without leading zeros,
// to unsigned long.
bool BigIntegerToLong(const uint8* data,
......@@ -280,7 +255,7 @@ bool ImportKeyInternalRaw(
return false;
}
mechanism = WebCryptoAlgorithmToHMACMechanism(params->hash());
mechanism = WebCryptoHashToHMACMechanism(params->hash());
if (mechanism == CKM_INVALID_MECHANISM) {
return false;
}
......@@ -685,7 +660,7 @@ bool WebCryptoImpl::GenerateKeyInternal(
if (params->hasLengthBytes()) {
keylen_bytes = params->optionalLengthBytes();
} else {
keylen_bytes = WebCryptoHmacAlgorithmToBlockSizeBits(algorithm) / 8;
keylen_bytes = webcrypto::ShaBlockSizeBytes(params->hash().id());
}
key_type = blink::WebCryptoKeyTypeSecret;
......@@ -880,7 +855,7 @@ bool WebCryptoImpl::SignInternal(
SymKeyHandle* sym_key = reinterpret_cast<SymKeyHandle*>(key.handle());
DCHECK_EQ(PK11_GetMechanism(sym_key->key()),
WebCryptoAlgorithmToHMACMechanism(params->hash()));
WebCryptoHashToHMACMechanism(params->hash()));
DCHECK_NE(0, key.usages() & blink::WebCryptoKeyUsageSign);
SECItem param_item = { siBuffer, NULL, 0 };
......
content/renderer/webcrypto/webcrypto_impl_openssl.cc
View file @ 384cc3ad
......@@ -51,27 +51,6 @@ const EVP_CIPHER* GetAESCipherByKeyLength(unsigned key_length_bytes) {
}
}
// TODO(eroman): This is wrong. These constants are bytes not bits. Moreover
// this doesn't match the NSS version.
unsigned WebCryptoHmacParamsToBlockSizeBytes(
const blink::WebCryptoHmacKeyParams* params) {
DCHECK(params);
switch (params->hash().id()) {
case blink::WebCryptoAlgorithmIdSha1:
return SHA_DIGEST_LENGTH / 8;
case blink::WebCryptoAlgorithmIdSha224:
return SHA224_DIGEST_LENGTH / 8;
case blink::WebCryptoAlgorithmIdSha256:
return SHA256_DIGEST_LENGTH / 8;
case blink::WebCryptoAlgorithmIdSha384:
return SHA384_DIGEST_LENGTH / 8;
case blink::WebCryptoAlgorithmIdSha512:
return SHA512_DIGEST_LENGTH / 8;
default:
return 0;
}
}
// OpenSSL constants for EVP_CipherInit_ex(), do not change
enum CipherOperation {
kDoDecrypt = 0,
......@@ -295,7 +274,7 @@ bool WebCryptoImpl::GenerateKeyInternal(
if (params->hasLengthBytes()) {
keylen_bytes = params->optionalLengthBytes();
} else {
keylen_bytes = WebCryptoHmacParamsToBlockSizeBytes(params);
keylen_bytes = webcrypto::ShaBlockSizeBytes(params->hash().id());
}
key_type = blink::WebCryptoKeyTypeSecret;
break;
......
content/renderer/webcrypto/webcrypto_impl_unittest.cc
View file @ 384cc3ad
......@@ -430,6 +430,51 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) {
// mac
"4f1ee7cb36c58803a8721d4ac8c4cf8cae5d8832392eed2a96dc59694252801b",
},
// L=28, Count=71
{
blink::WebCryptoAlgorithmIdSha224,
// key
"6c2539f4d0453efbbacc137794930413aeb392e029e0724715f9d943d6dcf7cdcc7fc19"
"7333df4fc476d5737ac3940d40eae",
// message
"1f207b3fa6c905529c9f9f7894b8941b616974df2c0cc482c400f50734f293139b5bbf9"
"7384adfafc56494ca0629ed0ca179daf03056e33295eb19ec8dcd4dff898281b4b9409c"
"a369f662d49091a225a678b1ebb75818dcb6278a2d136319f78f9ba9df5031a4f6305ee"
"fde5b761d2f196ee318e89bcc4acebc2e11ed3b5dc4",
// mac
"4a7d9d13705b0faba0db75356c8ee0635afff1544911c69c2fbb1ab2"
},
// L=48, Count=50
{
blink::WebCryptoAlgorithmIdSha384,
// key
"d137f3e6cc4af28554beb03ba7a97e60c9d3959cd3bb08068edbf68d402d0498c6ee0ae"
"9e3a20dc7d8586e5c352f605cee19",
// message
"64a884670d1c1dff555483dcd3da305dfba54bdc4d817c33ccb8fe7eb2ebf6236241031"
"09ec41644fa078491900c59a0f666f0356d9bc0b45bcc79e5fc9850f4543d96bc680090"
"44add0838ac1260e80592fbc557b2ddaf5ed1b86d3ed8f09e622e567f1d39a340857f6a"
"850cceef6060c48dac3dd0071fe68eb4ed2ed9aca01",
// mac
"c550fa53514da34f15e7f98ea87226ab6896cdfae25d3ec2335839f755cdc9a4992092e"
"70b7e5bd422784380b6396cf5"
},
// L=64, Count=65
{
blink::WebCryptoAlgorithmIdSha512,
// key
"c367aeb5c02b727883ffe2a4ceebf911b01454beb328fb5d57fc7f11bf744576aba421e2"
"a63426ea8109bd28ff21f53cd2bf1a11c6c989623d6ec27cdb0bbf458250857d819ff844"
"08b4f3dce08b98b1587ee59683af8852a0a5f55bda3ab5e132b4010e",
// message
"1a7331c8ff1b748e3cee96952190fdbbe4ee2f79e5753bbb368255ee5b19c05a4ed9f1b2"
"c72ff1e9b9cb0348205087befa501e7793770faf0606e9c901836a9bc8afa00d7db94ee2"
"9eb191d5cf3fc3e8da95a0f9f4a2a7964289c3129b512bd890de8700a9205420f28a8965"
"b6c67be28ba7fe278e5fcd16f0f22cf2b2eacbb9",
// mac
"4459066109cb11e6870fa9c6bfd251adfa304c0a2928ca915049704972edc560cc7c0bc3"
"8249e9101aae2f7d4da62eaff83fb07134efc277de72b9e4ab360425"
},
};
for (size_t test_index = 0; test_index < ARRAYSIZE_UNSAFE(kTests);
......@@ -732,17 +777,24 @@ TEST_F(WebCryptoImplTest, MAYBE(GenerateKeyHmac)) {
blink::WebArrayBuffer key_bytes;
blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
blink::WebCryptoAlgorithm algorithm = webcrypto::CreateHmacKeyGenAlgorithm(
blink::WebCryptoAlgorithmIdSha1, 128);
blink::WebCryptoAlgorithmIdSha1, 64);
ASSERT_TRUE(GenerateKeyInternal(algorithm, &key));
EXPECT_FALSE(key.isNull());
EXPECT_TRUE(key.handle());
EXPECT_EQ(blink::WebCryptoKeyTypeSecret, key.type());
EXPECT_EQ(blink::WebCryptoAlgorithmIdHmac, key.algorithm().id());
blink::WebArrayBuffer raw_key;
ASSERT_TRUE(ExportKeyInternal(blink::WebCryptoKeyFormatRaw, key, &raw_key));
EXPECT_EQ(64U, raw_key.byteLength());
keys.push_back(raw_key);
}
// Ensure all entries in the key sample set are unique. This is a simplistic
// estimate of whether the generated keys appear random.
EXPECT_FALSE(CopiesExist(keys));
}
// If the key length is not provided, then the block size is used.
TEST_F(WebCryptoImplTest, MAYBE(GenerateKeyHmacNoLength)) {
blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
blink::WebCryptoAlgorithm algorithm =
......@@ -750,6 +802,16 @@ TEST_F(WebCryptoImplTest, MAYBE(GenerateKeyHmacNoLength)) {
ASSERT_TRUE(GenerateKeyInternal(algorithm, &key));
EXPECT_TRUE(key.handle());
EXPECT_EQ(blink::WebCryptoKeyTypeSecret, key.type());
blink::WebArrayBuffer raw_key;
ASSERT_TRUE(ExportKeyInternal(blink::WebCryptoKeyFormatRaw, key, &raw_key));
EXPECT_EQ(64U, raw_key.byteLength());
// The block size for HMAC SHA-512 is larger.
algorithm = webcrypto::CreateHmacKeyGenAlgorithm(
blink::WebCryptoAlgorithmIdSha512, 0);
ASSERT_TRUE(GenerateKeyInternal(algorithm, &key));
ASSERT_TRUE(ExportKeyInternal(blink::WebCryptoKeyFormatRaw, key, &raw_key));
EXPECT_EQ(128U, raw_key.byteLength());
}
TEST_F(WebCryptoImplTest, MAYBE(ImportSecretKeyNoAlgorithm)) {
......
content/renderer/webcrypto/webcrypto_util.cc
View file @ 384cc3ad
......@@ -172,6 +172,21 @@ blink::WebCryptoAlgorithm CreateAesGcmKeyGenAlgorithm(
key_length_bits);
}
unsigned int ShaBlockSizeBytes(blink::WebCryptoAlgorithmId hash_id) {
switch (hash_id) {
case blink::WebCryptoAlgorithmIdSha1:
case blink::WebCryptoAlgorithmIdSha224:
case blink::WebCryptoAlgorithmIdSha256:
return 64;
case blink::WebCryptoAlgorithmIdSha384:
case blink::WebCryptoAlgorithmIdSha512:
return 128;
default:
NOTREACHED();
return 0;
}
}
} // namespace webcrypto
} // namespace content
content/renderer/webcrypto/webcrypto_util.h
View file @ 384cc3ad
......@@ -94,6 +94,9 @@ CONTENT_EXPORT blink::WebCryptoAlgorithm CreateAesCbcKeyGenAlgorithm(
blink::WebCryptoAlgorithm CreateAesGcmKeyGenAlgorithm(
unsigned short key_length_bits);
// Returns the internal block size for SHA-*
unsigned int ShaBlockSizeBytes(blink::WebCryptoAlgorithmId hash_id);
} // namespace webcrypto
} // namespace content
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment