Refactor the interface for generating keys.

content/child/webcrypto/test/aes_cbc_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/stl_util.h"
 #include "content/child/webcrypto/algorithm_dispatch.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/status.h"
 #include "content/child/webcrypto/test/test_helpers.h"
 #include "content/child/webcrypto/webcrypto_util.h"
@@ skipping 243 matching lines @@
   const unsigned short kKeyLength[] = {128, 256};
   for (size_t key_length_i = 0; key_length_i < ARRAYSIZE_UNSAFE(kKeyLength);
        ++key_length_i) {
     blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
 
     std::vector<std::vector<uint8_t> > keys;
     std::vector<uint8_t> key_bytes;
 
     // Generate a small sample of keys.
     for (int j = 0; j < 16; ++j) {
-      ASSERT_EQ(Status::Success(),
-                GenerateSecretKey(
-                    CreateAesCbcKeyGenAlgorithm(kKeyLength[key_length_i]),
-                    true,
-                    0,
-                    &key));
+      ASSERT_EQ(
+          Status::Success(),
+          GenerateKey(CreateAesCbcKeyGenAlgorithm(kKeyLength[key_length_i]),
+                      true,
+                      0,
+                      NULL,
+                      &key));
       EXPECT_TRUE(key.handle());
       EXPECT_EQ(blink::WebCryptoKeyTypeSecret, key.type());
       ASSERT_EQ(Status::Success(),
                 ExportKey(blink::WebCryptoKeyFormatRaw, key, &key_bytes));
       EXPECT_EQ(key_bytes.size() * 8,
                 key.algorithm().aesParams()->lengthBits());
       keys.push_back(key_bytes);
     }
     // 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));
   }
 }
 
 TEST(WebCryptoAesCbcTest, GenerateKeyBadLength) {
   const unsigned short kKeyLen[] = {0, 127, 257};
   blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kKeyLen); ++i) {
     SCOPED_TRACE(i);
-    EXPECT_EQ(Status::ErrorGenerateKeyLength(),
-              GenerateSecretKey(
-                  CreateAesCbcKeyGenAlgorithm(kKeyLen[i]), true, 0, &key));
+    EXPECT_EQ(
+        Status::ErrorGenerateKeyLength(),
+        GenerateKey(
+            CreateAesCbcKeyGenAlgorithm(kKeyLen[i]), true, 0, NULL, &key));
   }
 }
 
 // If key_ops is specified but empty, no key usages are allowed for the key.
 TEST(WebCryptoAesCbcTest, ImportKeyJwkEmptyKeyOps) {
   blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
   base::DictionaryValue dict;
   dict.SetString("kty", "oct");
   dict.SetBoolean("ext", false);
   dict.SetString("k", "GADWrMRHwQfoNaXU5fZvTg==");
@@ skipping 532 matching lines @@
       ImportKeyJwkFromDict(dict,
                            CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc),
                            false,
                            blink::WebCryptoKeyUsageEncrypt,
                            &key));
 }
 
 // AES 192-bit is not allowed: http://crbug.com/381829
 TEST(WebCryptoAesCbcTest, GenerateAesCbc192) {
   blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
-  Status status = GenerateSecretKey(CreateAesCbcKeyGenAlgorithm(192),
-                                    true,
-                                    blink::WebCryptoKeyUsageEncrypt,
-                                    &key);
+  Status status = GenerateKey(CreateAesCbcKeyGenAlgorithm(192),
+                              true,
+                              blink::WebCryptoKeyUsageEncrypt,
+                              NULL,
+                              &key);
   ASSERT_EQ(Status::ErrorAes192BitUnsupported(), status);
 }
 
 // AES 192-bit is not allowed: http://crbug.com/381829
 TEST(WebCryptoAesCbcTest, UnwrapAesCbc192) {
   std::vector<uint8_t> wrapping_key_data(16, 0);
   std::vector<uint8_t> wrapped_key = HexStringToBytes(
       "1A07ACAB6C906E50883173C29441DB1DE91D34F45C435B5F99C822867FB3956F");
 
   blink::WebCryptoKey wrapping_key =
@@ skipping 49 matching lines @@
   blink::WebCryptoKeyUsageMask bad_usages[] = {
       blink::WebCryptoKeyUsageSign, blink::WebCryptoKeyUsageVerify,
       blink::WebCryptoKeyUsageDecrypt | blink::WebCryptoKeyUsageVerify,
   };
 
   for (size_t i = 0; i < arraysize(bad_usages); ++i) {
     SCOPED_TRACE(i);
 
     blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
 
-    ASSERT_EQ(Status::ErrorCreateKeyBadUsages(),
-              GenerateSecretKey(
-                  CreateAesCbcKeyGenAlgorithm(128), true, bad_usages[i], &key));
+    ASSERT_EQ(
+        Status::ErrorCreateKeyBadUsages(),
+        GenerateKey(
+            CreateAesCbcKeyGenAlgorithm(128), true, bad_usages[i], NULL, &key));
   }
 }
 
 // Generate an AES-CBC key and an RSA key pair. Use the AES-CBC key to wrap the
 // key pair (using SPKI format for public key, PKCS8 format for private key).
 // Then unwrap the wrapped key pair and verify that the key data is the same.
 TEST(WebCryptoAesCbcTest, WrapUnwrapRoundtripSpkiPkcs8) {
   if (!SupportsRsaPrivateKeyImport())
     return;
 
   // Generate the wrapping key.
   blink::WebCryptoKey wrapping_key = blink::WebCryptoKey::createNull();
   ASSERT_EQ(Status::Success(),
-            GenerateSecretKey(CreateAesCbcKeyGenAlgorithm(128),
-                              true,
-                              blink::WebCryptoKeyUsageWrapKey |
-                                  blink::WebCryptoKeyUsageUnwrapKey,
-                              &wrapping_key));
+            GenerateKey(CreateAesCbcKeyGenAlgorithm(128),
+                        true,
+                        blink::WebCryptoKeyUsageWrapKey |
+                            blink::WebCryptoKeyUsageUnwrapKey,
+                        NULL,
+                        &wrapping_key));
 
   // Generate an RSA key pair to be wrapped.
   const unsigned int modulus_length = 256;
   const std::vector<uint8_t> public_exponent = HexStringToBytes("010001");
 
   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,
-                            0,
-                            &public_key,
-                            &private_key));
+            GenerateKey(CreateRsaHashedKeyGenAlgorithm(
+                            blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                            blink::WebCryptoAlgorithmIdSha256,
+                            modulus_length,
+                            public_exponent),
+                        true,
+                        0,
+                        &public_key,
+                        &private_key));
 
   // Export key pair as SPKI + PKCS8
   std::vector<uint8_t> public_key_spki;
   ASSERT_EQ(
       Status::Success(),
       ExportKey(blink::WebCryptoKeyFormatSpki, public_key, &public_key_spki));
 
   std::vector<uint8_t> private_key_pkcs8;
   ASSERT_EQ(
       Status::Success(),
@@ skipping 67 matching lines @@
 
   EXPECT_NE(public_key_spki, wrapped_public_key);
   EXPECT_NE(private_key_pkcs8, wrapped_private_key);
 }
 
 }  // namespace
 
 }  // namespace webcrypto
 
 }  // namespace content