[refactor] More post-NSS WebCrypto cleanups (utility functions).

components/webcrypto/algorithms/util_openssl.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 COMPONENTS_WEBCRYPTO_ALGORITHMS_UTIL_OPENSSL_H_
 #define COMPONENTS_WEBCRYPTO_ALGORITHMS_UTIL_OPENSSL_H_
 
 #include <string>
 #include <vector>
 
-#include <openssl/ossl_typ.h>
+#include <openssl/base.h>
 
 #include "crypto/scoped_openssl_types.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoKey.h"
 
 namespace webcrypto {
 
 class CryptoData;
 class GenerateKeyResult;
 class Status;
@@ skipping 10 matching lines @@
 //   * |buffer| where the ciphertext or plaintext is written to.
 Status AeadEncryptDecrypt(EncryptOrDecrypt mode,
                           const std::vector<uint8_t>& raw_key,
                           const CryptoData& data,
                           unsigned int tag_length_bytes,
                           const CryptoData& iv,
                           const CryptoData& additional_data,
                           const EVP_AEAD* aead_alg,
                           std::vector<uint8_t>* buffer);
 
-// Generates a random secret key of the given bit length. If the bit length is
-// not a multiple of 8, then the resulting key will have ceil(keylen_bits / 8)
-// bytes, and the "unused" bits will be set to zero. This function does not do
-// any validation checks on the provided parameters.
-Status GenerateWebCryptoSecretKey(const blink::WebCryptoKeyAlgorithm& algorithm,
-                                  bool extractable,
-                                  blink::WebCryptoKeyUsageMask usages,
-                                  unsigned int keylen_bits,
-                                  GenerateKeyResult* result);
-
-// Creates a WebCrypto secret key given a the raw data. The provided |key_data|
-// will be copied into the new key. This function does not do any validation
-// checks for the provided parameters.
-Status CreateWebCryptoSecretKey(const CryptoData& key_data,
-                                const blink::WebCryptoKeyAlgorithm& algorithm,
-                                bool extractable,
-                                blink::WebCryptoKeyUsageMask usages,
-                                blink::WebCryptoKey* key);
-
 // Creates a WebCrypto public key given an EVP_PKEY. This step includes
 // exporting the key to SPKI format, for use by serialization later.
 Status CreateWebCryptoPublicKey(crypto::ScopedEVP_PKEY public_key,
                                 const blink::WebCryptoKeyAlgorithm& algorithm,
                                 bool extractable,
                                 blink::WebCryptoKeyUsageMask usages,
                                 blink::WebCryptoKey* key);
 
 // Creates a WebCrypto private key given an EVP_PKEY. This step includes
 // exporting the key to PKCS8 format, for use by serialization later.
@@ skipping 21 matching lines @@
 
 // Allocates a new BIGNUM given a std::string big-endian representation.
 BIGNUM* CreateBIGNUM(const std::string& n);
 
 // Converts a BIGNUM to a big endian byte array.
 std::vector<uint8_t> BIGNUMToVector(const BIGNUM* n);
 
 }  // namespace webcrypto
 
 #endif  // COMPONENTS_WEBCRYPTO_ALGORITHMS_UTIL_OPENSSL_H_