Refactor the interface for generating keys.

content/child/webcrypto/algorithm_dispatch.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/algorithm_dispatch.h"
 
 #include "base/logging.h"
 #include "content/child/webcrypto/algorithm_implementation.h"
 #include "content/child/webcrypto/algorithm_registry.h"
 #include "content/child/webcrypto/crypto_data.h"
@@ skipping 84 matching lines @@
               const CryptoData& data,
               std::vector<uint8_t>* buffer) {
   const AlgorithmImplementation* impl = NULL;
   Status status = GetAlgorithmImplementation(algorithm.id(), &impl);
   if (status.IsError())
     return status;
 
   return impl->Digest(algorithm, data, buffer);
 }
 
-Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
-                         bool extractable,
-                         blink::WebCryptoKeyUsageMask usage_mask,
-                         blink::WebCryptoKey* key) {
+Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
+                   bool extractable,
+                   blink::WebCryptoKeyUsageMask usage_mask,
+                   blink::WebCryptoKey* public_key,
+                   blink::WebCryptoKey* private_key) {
   const AlgorithmImplementation* impl = NULL;
   Status status = GetAlgorithmImplementation(algorithm.id(), &impl);
   if (status.IsError())
     return status;
 
-  status = impl->VerifyKeyUsagesBeforeGenerateKey(usage_mask);
-  if (status.IsError())
-    return status;
-
-  return impl->GenerateSecretKey(algorithm, extractable, usage_mask, key);
-}
-
-Status GenerateKeyPair(const blink::WebCryptoAlgorithm& algorithm,
-                       bool extractable,
-                       blink::WebCryptoKeyUsageMask combined_usage_mask,
-                       blink::WebCryptoKey* public_key,
-                       blink::WebCryptoKey* private_key) {
-  const AlgorithmImplementation* impl = NULL;
-  Status status = GetAlgorithmImplementation(algorithm.id(), &impl);
-  if (status.IsError())
-    return status;
-
-  blink::WebCryptoKeyUsageMask public_usage_mask;
-  blink::WebCryptoKeyUsageMask private_usage_mask;
-  status = impl->VerifyKeyUsagesBeforeGenerateKeyPair(
-      combined_usage_mask, &public_usage_mask, &private_usage_mask);
-  if (status.IsError())
-    return status;
-
-  return impl->GenerateKeyPair(algorithm,
-                               extractable,
-                               public_usage_mask,
-                               private_usage_mask,
-                               public_key,
-                               private_key);
+  return impl->GenerateKey(
+      algorithm, extractable, usage_mask, public_key, private_key);
 }
 
 // Note that this function may be called from the target Blink thread.
 Status ImportKey(blink::WebCryptoKeyFormat format,
                  const CryptoData& key_data,
                  const blink::WebCryptoAlgorithm& algorithm,
                  bool extractable,
                  blink::WebCryptoKeyUsageMask usage_mask,
                  blink::WebCryptoKey* key) {
   const AlgorithmImplementation* impl = NULL;
@@ skipping 122 matching lines @@
 
 scoped_ptr<blink::WebCryptoDigestor> CreateDigestor(
     blink::WebCryptoAlgorithmId algorithm) {
   PlatformInit();
   return CreatePlatformDigestor(algorithm);
 }
 
 }  // namespace webcrypto
 
 }  // namespace content