[webcrypto] Update to use the KeyAlgorithm.

content/renderer/webcrypto/platform_crypto.h

 // 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.
 
 #ifndef CONTENT_RENDERER_WEBCRYPTO_PLATFORM_CRYPTO_H_
 #define CONTENT_RENDERER_WEBCRYPTO_PLATFORM_CRYPTO_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
@@ skipping 104 matching lines @@
 //  * keylen_bytes is non-zero (TODO(eroman): revisit this).
 //  * For AES algorithms |keylen_bytes| is either 16, 24, or 32 bytes long.
 Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
                          bool extractable,
                          blink::WebCryptoKeyUsageMask usage_mask,
                          unsigned keylen_bytes,
                          blink::WebCryptoKey* key);
 
 // Preconditions:
 //  * algorithm.id() is for an RSA algorithm.
-//  * algorithm.rsaKeyGenParams() is non-null.
+//  * public_exponent, modulus_length_bits and hash_or_null are the same as what
+//    is in algorithm. They are split out for convenience.
+//  * hash_or_null.isNull() may be true if a hash is not applicable to the
+//    algorithm
+//  * modulus_length_bits is not 0
+//  * public_exponent is not empty.
 Status GenerateRsaKeyPair(const blink::WebCryptoAlgorithm& algorithm,
                           bool extractable,
                           blink::WebCryptoKeyUsageMask usage_mask,
+                          unsigned int modulus_length_bits,
+                          const CryptoData& public_exponent,
+                          const blink::WebCryptoAlgorithm& hash,
                           blink::WebCryptoKey* public_key,
                           blink::WebCryptoKey* private_key);
 
 // Preconditions:
 //  * |key| is non-null.
 //  * |algorithm.id()| is for a symmetric key algorithm.
 //  * For AES algorithms |key_data| is either 16, 24, or 32 bytes long.
 Status ImportKeyRaw(const blink::WebCryptoAlgorithm& algorithm,
                     const CryptoData& key_data,
                     bool extractable,
                     blink::WebCryptoKeyUsageMask usage_mask,
                     blink::WebCryptoKey* key);
 
 // Preconditions:
 //  * algorithm.id() is for an RSA algorithm.
 Status ImportRsaPublicKey(const blink::WebCryptoAlgorithm& algorithm,
                           bool extractable,
                           blink::WebCryptoKeyUsageMask usage_mask,
                           const CryptoData& modulus_data,
                           const CryptoData& exponent_data,
                           blink::WebCryptoKey* key);
 
 Status ImportKeySpki(const blink::WebCryptoAlgorithm& algorithm_or_null,
                      const CryptoData& key_data,
-                     bool extractable,
                      blink::WebCryptoKeyUsageMask usage_mask,
                      blink::WebCryptoKey* key);
 
 Status ImportKeyPkcs8(const blink::WebCryptoAlgorithm& algorithm_or_null,
                       const CryptoData& key_data,
                       bool extractable,
                       blink::WebCryptoKeyUsageMask usage_mask,
                       blink::WebCryptoKey* key);
 
 // Preconditions:
 //  * |key| is non-null.
 Status ExportKeyRaw(SymKey* key, blink::WebArrayBuffer* buffer);
 
 // Preconditions:
 //  * |key| is non-null.
 Status ExportKeySpki(PublicKey* key, blink::WebArrayBuffer* buffer);
 
 }  // namespace platform
 
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_WEBCRYPTO_PLATFORM_CRYPTO_H_