Refactor RSA key generation for WebCrypto's NSS implementation.

content/child/webcrypto/shared_crypto_unittest.cc

Index: content/child/webcrypto/shared_crypto_unittest.cc
diff --git a/content/child/webcrypto/shared_crypto_unittest.cc b/content/child/webcrypto/shared_crypto_unittest.cc
index b6fa177db7da2a99daeb9d6f26f5eb18b07fc882..86d2928f1b92d356327eb9452a2aaf66affc94e9 100644
--- a/content/child/webcrypto/shared_crypto_unittest.cc
+++ b/content/child/webcrypto/shared_crypto_unittest.cc
@@ -2524,7 +2524,7 @@ TEST_F(SharedCryptoTest, MAYBE(GenerateKeyPairRsa)) {
                                      blink::WebCryptoAlgorithmIdSha256,
                                      0,
                                      public_exponent);
-  EXPECT_EQ(Status::ErrorGenerateRsaZeroModulus(),
+  EXPECT_EQ(Status::ErrorGenerateRsaUnsupportedModulus(),
             GenerateKeyPair(
                 algorithm, extractable, usage_mask, &public_key, &private_key));
 
@@ -2626,33 +2626,34 @@ TEST_F(SharedCryptoTest, MAYBE(GenerateKeyPairRsa)) {
             ExportKey(blink::WebCryptoKeyFormatSpki, private_key, &output));
 }
 
-TEST_F(SharedCryptoTest, MAYBE(GenerateKeyPairRsaBadModulusLength)) {
-  const unsigned int kBadModulus[] = {
+TEST_F(SharedCryptoTest, GenerateKeyPairRsaBadModulusLength) {
+  const unsigned int kBadModulusBits[] = {
       0,
-      255,         // Not a multiple of 8.
+      248,         // Too small.
+      257,         // Not a multiple of 8.
       1023,        // Not a multiple of 8.
-      0xFFFFFFFF,  // Cannot fit in a signed int.
+      0xFFFFFFFF,  // Too big.
       16384 + 8,   // 16384 is the maxmimum length that NSS succeeds for.
   };
 
   const std::vector<uint8_t> public_exponent = HexStringToBytes("010001");
 
-  for (size_t i = 0; i < arraysize(kBadModulus); ++i) {
-    const unsigned int modulus_length = kBadModulus[i];
+  for (size_t i = 0; i < arraysize(kBadModulusBits); ++i) {
+    const unsigned int modulus_length_bits = kBadModulusBits[i];
     blink::WebCryptoAlgorithm algorithm = CreateRsaHashedKeyGenAlgorithm(
         blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
         blink::WebCryptoAlgorithmIdSha256,
-        modulus_length,
+        modulus_length_bits,
         public_exponent);
     bool extractable = true;
     const blink::WebCryptoKeyUsageMask usage_mask = 0;
     blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull();
     blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
 
-    EXPECT_FALSE(
+    EXPECT_EQ(
+        Status::ErrorGenerateRsaUnsupportedModulus(),
         GenerateKeyPair(
-            algorithm, extractable, usage_mask, &public_key, &private_key)
-            .IsSuccess());
+            algorithm, extractable, usage_mask, &public_key, &private_key));
   }
 }