Refactor the interface for generating keys.

content/child/webcrypto/nss/hmac_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 <cryptohi.h>
 #include <pk11pub.h>
 #include <secerr.h>
 #include <sechash.h>
 
 #include "base/logging.h"
@@ skipping 37 matching lines @@
       return true;
     default:
       return false;
   }
 }
 
 class HmacImplementation : public AlgorithmImplementation {
  public:
   HmacImplementation() {}
 
-  virtual Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
-                                   bool extractable,
-                                   blink::WebCryptoKeyUsageMask usage_mask,
-                                   blink::WebCryptoKey* key) const override {
+  virtual Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
+                             bool extractable,
+                             blink::WebCryptoKeyUsageMask usage_mask,
+                             GenerateKeyResult* result) const override {
+    Status status = CheckKeyCreationUsages(kAllKeyUsages, usage_mask);
+    if (status.IsError())
+      return status;
+
     const blink::WebCryptoHmacKeyGenParams* params =
         algorithm.hmacKeyGenParams();
 
     const blink::WebCryptoAlgorithm& hash = params->hash();
     CK_MECHANISM_TYPE mechanism = CKM_INVALID_MECHANISM;
     if (!WebCryptoHashToHMACMechanism(hash, &mechanism))
       return Status::ErrorUnsupported();
 
     unsigned int keylen_bits = 0;
-    Status status = GetHmacKeyGenLengthInBits(params, &keylen_bits);
+    status = GetHmacKeyGenLengthInBits(params, &keylen_bits);
     if (status.IsError())
       return status;
 
     return GenerateSecretKeyNss(
         blink::WebCryptoKeyAlgorithm::createHmac(hash.id(), keylen_bits),
         extractable,
         usage_mask,
         keylen_bits / 8,
         mechanism,
-        key);
+        result);
   }
 
   virtual Status VerifyKeyUsagesBeforeImportKey(
       blink::WebCryptoKeyFormat format,
       blink::WebCryptoKeyUsageMask usage_mask) const override {
     switch (format) {
       case blink::WebCryptoKeyFormatRaw:
       case blink::WebCryptoKeyFormatJwk:
         return CheckKeyCreationUsages(kAllKeyUsages, usage_mask);
       default:
         return Status::ErrorUnsupportedImportKeyFormat();
     }
   }
 
-  virtual Status VerifyKeyUsagesBeforeGenerateKey(
-      blink::WebCryptoKeyUsageMask usage_mask) const override {
-    return CheckKeyCreationUsages(kAllKeyUsages, usage_mask);
-  }
-
   virtual Status ImportKeyRaw(const CryptoData& key_data,
                               const blink::WebCryptoAlgorithm& algorithm,
                               bool extractable,
                               blink::WebCryptoKeyUsageMask usage_mask,
                               blink::WebCryptoKey* key) const override {
     const blink::WebCryptoAlgorithm& hash =
         algorithm.hmacImportParams()->hash();
 
     CK_MECHANISM_TYPE mechanism = CKM_INVALID_MECHANISM;
     if (!WebCryptoHashToHMACMechanism(hash, &mechanism))
@@ skipping 121 matching lines @@
 
 }  // namespace
 
 AlgorithmImplementation* CreatePlatformHmacImplementation() {
   return new HmacImplementation;
 }
 
 }  // namespace webcrypto
 
 }  // namespace content