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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/child/webcrypto/test/rsa_ssa_unittest.cc

Issue 512023002: Refactor the interface for generating keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« content/child/webcrypto/algorithm_dispatch.h ('K') | « content/child/webcrypto/test/hmac_unittest.cc ('k') | content/child/webcrypto/webcrypto_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/test/rsa_ssa_unittest.cc
diff --git a/content/child/webcrypto/test/rsa_ssa_unittest.cc b/content/child/webcrypto/test/rsa_ssa_unittest.cc
index f3246c07b8148731d1c306648e8f2bc31bd356b6..59e7829f3cb4e218778b10a996c487e2092dd9f9 100644
--- a/content/child/webcrypto/test/rsa_ssa_unittest.cc
+++ b/content/child/webcrypto/test/rsa_ssa_unittest.cc
@@ -544,7 +544,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
EXPECT_EQ(Status::Success(),
- GenerateKeyPair(
+ GenerateKey(
algorithm, extractable, usage_mask, &public_key, &private_key));
EXPECT_FALSE(public_key.isNull());
EXPECT_FALSE(private_key.isNull());
@@ -610,7 +610,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
0,
public_exponent);
EXPECT_EQ(Status::ErrorGenerateRsaUnsupportedModulus(),
- GenerateKeyPair(
+ GenerateKey(
algorithm, extractable, usage_mask, &public_key, &private_key));
// Fail with bad exponent: larger than unsigned long.
@@ -622,7 +622,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
modulus_length,
long_exponent);
EXPECT_EQ(Status::ErrorGenerateKeyPublicExponent(),
- GenerateKeyPair(
+ GenerateKey(
algorithm, extractable, usage_mask, &public_key, &private_key));
// Fail with bad exponent: empty.
@@ -633,7 +633,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
modulus_length,
empty_exponent);
EXPECT_EQ(Status::ErrorGenerateKeyPublicExponent(),
- GenerateKeyPair(
+ GenerateKey(
algorithm, extractable, usage_mask, &public_key, &private_key));
// Fail with bad exponent: all zeros.
@@ -644,7 +644,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
modulus_length,
exponent_with_leading_zeros);
EXPECT_EQ(Status::ErrorGenerateKeyPublicExponent(),
- GenerateKeyPair(
+ GenerateKey(
algorithm, extractable, usage_mask, &public_key, &private_key));
// Key generation success using exponent with leading zeros.
@@ -657,7 +657,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
modulus_length,
exponent_with_leading_zeros);
EXPECT_EQ(Status::Success(),
- GenerateKeyPair(
+ GenerateKey(
algorithm, extractable, usage_mask, &public_key, &private_key));
EXPECT_FALSE(public_key.isNull());
EXPECT_FALSE(private_key.isNull());
@@ -676,7 +676,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
public_exponent);
EXPECT_EQ(
Status::Success(),
- GenerateKeyPair(algorithm, false, usage_mask, &public_key, &private_key));
+ GenerateKey(algorithm, false, usage_mask, &public_key, &private_key));
EXPECT_FALSE(public_key.isNull());
EXPECT_FALSE(private_key.isNull());
EXPECT_EQ(blink::WebCryptoKeyTypePublic, public_key.type());
@@ -706,7 +706,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsa) {
// This should fail since spki is for public keys.
EXPECT_EQ(
Status::Success(),
- GenerateKeyPair(algorithm, true, usage_mask, &public_key, &private_key));
+ GenerateKey(algorithm, true, usage_mask, &public_key, &private_key));
EXPECT_EQ(Status::ErrorUnexpectedKeyType(),
ExportKey(blink::WebCryptoKeyFormatSpki, private_key, &output));
}
@@ -737,7 +737,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsaBadModulusLength) {
EXPECT_EQ(
Status::ErrorGenerateRsaUnsupportedModulus(),
- GenerateKeyPair(
+ GenerateKey(
algorithm, extractable, usage_mask, &public_key, &private_key));
}
}
@@ -767,7 +767,7 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairRsaBadExponent) {
blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
EXPECT_EQ(Status::ErrorGenerateKeyPublicExponent(),
- GenerateKeyPair(algorithm, true, 0, &public_key, &private_key));
+ GenerateKey(algorithm, true, 0, &public_key, &private_key));
}
}
@@ -1035,15 +1035,15 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyBadUsages) {
blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
ASSERT_EQ(Status::ErrorCreateKeyBadUsages(),
- GenerateKeyPair(CreateRsaHashedKeyGenAlgorithm(
- blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
- blink::WebCryptoAlgorithmIdSha256,
- modulus_length,
- public_exponent),
- true,
- bad_usages[i],
- &public_key,
- &private_key));
+ GenerateKey(CreateRsaHashedKeyGenAlgorithm(
+ blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+ blink::WebCryptoAlgorithmIdSha256,
+ modulus_length,
+ public_exponent),
+ true,
+ bad_usages[i],
+ &public_key,
+ &private_key));
}
}
@@ -1057,32 +1057,32 @@ TEST(WebCryptoRsaSsaTest, GenerateKeyPairIntersectUsages) {
blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull();
blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
- ASSERT_EQ(Status::Success(),
- GenerateKeyPair(
- CreateRsaHashedKeyGenAlgorithm(
- blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
- blink::WebCryptoAlgorithmIdSha256,
- modulus_length,
- public_exponent),
- true,
- blink::WebCryptoKeyUsageSign | blink::WebCryptoKeyUsageVerify,
- &public_key,
- &private_key));
+ ASSERT_EQ(
+ Status::Success(),
+ GenerateKey(CreateRsaHashedKeyGenAlgorithm(
+ blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+ blink::WebCryptoAlgorithmIdSha256,
+ modulus_length,
+ public_exponent),
+ true,
+ blink::WebCryptoKeyUsageSign | blink::WebCryptoKeyUsageVerify,
+ &public_key,
+ &private_key));
EXPECT_EQ(blink::WebCryptoKeyUsageVerify, public_key.usages());
EXPECT_EQ(blink::WebCryptoKeyUsageSign, private_key.usages());
// Try again but this time without the Verify usages.
ASSERT_EQ(Status::Success(),
- GenerateKeyPair(CreateRsaHashedKeyGenAlgorithm(
- blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
- blink::WebCryptoAlgorithmIdSha256,
- modulus_length,
- public_exponent),
- true,
- blink::WebCryptoKeyUsageSign,
- &public_key,
- &private_key));
+ GenerateKey(CreateRsaHashedKeyGenAlgorithm(
+ blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+ blink::WebCryptoAlgorithmIdSha256,
+ modulus_length,
+ public_exponent),
+ true,
+ blink::WebCryptoKeyUsageSign,
+ &public_key,
+ &private_key));
EXPECT_EQ(0, public_key.usages());
EXPECT_EQ(blink::WebCryptoKeyUsageSign, private_key.usages());
« content/child/webcrypto/algorithm_dispatch.h ('K') | « content/child/webcrypto/test/hmac_unittest.cc ('k') | content/child/webcrypto/webcrypto_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698