Refactor the interface for generating keys.

content/child/webcrypto/nss/aes_key_nss.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 "content/child/webcrypto/nss/aes_key_nss.h"
 
 #include "base/logging.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/jwk.h"
 #include "content/child/webcrypto/nss/key_nss.h"
@@ skipping 20 matching lines @@
                            const std::string& jwk_suffix)
     : import_mechanism_(import_mechanism),
       import_flags_(CKF_ENCRYPT | CKF_DECRYPT),
       all_key_usages_(blink::WebCryptoKeyUsageEncrypt |
                       blink::WebCryptoKeyUsageDecrypt |
                       blink::WebCryptoKeyUsageWrapKey |
                       blink::WebCryptoKeyUsageUnwrapKey),
       jwk_suffix_(jwk_suffix) {
 }
 
-Status AesAlgorithm::VerifyKeyUsagesBeforeGenerateKey(
-    blink::WebCryptoKeyUsageMask usage_mask) const {
-  return CheckKeyCreationUsages(all_key_usages_, usage_mask);
-}
-
-Status AesAlgorithm::GenerateSecretKey(
-    const blink::WebCryptoAlgorithm& algorithm,
-    bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
-    blink::WebCryptoKey* key) const {
-  unsigned int keylen_bits;
-  Status status =
-      GetAesKeyGenLengthInBits(algorithm.aesKeyGenParams(), &keylen_bits);
+Status AesAlgorithm::GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
+                                 bool extractable,
+                                 blink::WebCryptoKeyUsageMask usage_mask,
+                                 blink::WebCryptoKey*,
+                                 blink::WebCryptoKey* key) const {
+  Status status = CheckKeyCreationUsages(all_key_usages_, usage_mask);
   if (status.IsError())
     return status;
 
+  unsigned int keylen_bits;
+  status = GetAesKeyGenLengthInBits(algorithm.aesKeyGenParams(), &keylen_bits);
+  if (status.IsError())
+    return status;
+
   return GenerateSecretKeyNss(
       blink::WebCryptoKeyAlgorithm::createAes(algorithm.id(), keylen_bits),
       extractable,
       usage_mask,
       keylen_bits / 8,
       CKM_AES_KEY_GEN,
       key);
 }
 
 Status AesAlgorithm::VerifyKeyUsagesBeforeImportKey(
@@ skipping 61 matching lines @@
                     key.extractable(),
                     key.usages(),
                     buffer);
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content