Refactor the interface for generating keys.

content/child/webcrypto/nss/rsa_oaep_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 <keyhi.h>
 #include <pk11pub.h>
 #include <secerr.h>
 #include <sechash.h>
 
@@ skipping 150 matching lines @@
 
 class RsaOaepImplementation : public RsaHashedAlgorithm {
  public:
   RsaOaepImplementation()
       : RsaHashedAlgorithm(
             CKF_ENCRYPT | CKF_DECRYPT | CKF_WRAP | CKF_UNWRAP,
             blink::WebCryptoKeyUsageEncrypt | blink::WebCryptoKeyUsageWrapKey,
             blink::WebCryptoKeyUsageDecrypt |
                 blink::WebCryptoKeyUsageUnwrapKey) {}
 
-  virtual Status VerifyKeyUsagesBeforeGenerateKeyPair(
-      blink::WebCryptoKeyUsageMask combined_usage_mask,
-      blink::WebCryptoKeyUsageMask* public_usage_mask,
-      blink::WebCryptoKeyUsageMask* private_usage_mask) const OVERRIDE {
+  virtual Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
+                             bool extractable,
+                             blink::WebCryptoKeyUsageMask usage_mask,
+                             blink::WebCryptoKey* public_key,
+                             blink::WebCryptoKey* private_key) const OVERRIDE {
     Status status = NssSupportsRsaOaep();
     if (status.IsError())
       return status;
-    return RsaHashedAlgorithm::VerifyKeyUsagesBeforeGenerateKeyPair(
-        combined_usage_mask, public_usage_mask, private_usage_mask);
+    return RsaHashedAlgorithm::GenerateKey(
+        algorithm, extractable, usage_mask, public_key, private_key);
   }
 
   virtual Status VerifyKeyUsagesBeforeImportKey(
       blink::WebCryptoKeyFormat format,
       blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE {
     Status status = NssSupportsRsaOaep();
     if (status.IsError())
       return status;
     return RsaHashedAlgorithm::VerifyKeyUsagesBeforeImportKey(format,
                                                               usage_mask);
@@ skipping 48 matching lines @@
 
 }  // namespace
 
 AlgorithmImplementation* CreatePlatformRsaOaepImplementation() {
   return new RsaOaepImplementation;
 }
 
 }  // namespace webcrypto
 
 }  // namespace content