Use new BoringSSL scopers in //crypto

crypto/ec_private_key.h

 // Copyright (c) 2012 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 CRYPTO_EC_PRIVATE_KEY_H_
 #define CRYPTO_EC_PRIVATE_KEY_H_
 
+#include <openssl/base.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
 
-// Forward declaration for openssl/*.h
-typedef struct evp_pkey_st EVP_PKEY;
-
 namespace crypto {
 
 // Encapsulates an elliptic curve (EC) private key. Can be used to generate new
 // keys, export keys to other formats, or to extract a public key.
 // TODO(mattm): make this and RSAPrivateKey implement some PrivateKey interface.
 // (The difference in types of key() and public_key() make this a little
 // tricky.)
 class CRYPTO_EXPORT ECPrivateKey {
  public:
   ~ECPrivateKey();
@@ skipping 17 matching lines @@
   // This function is deprecated. Use CreateFromPrivateKeyInfo for new code.
   // See https://crbug.com/603319.
   static std::unique_ptr<ECPrivateKey> CreateFromEncryptedPrivateKeyInfo(
       const std::string& password,
       const std::vector<uint8_t>& encrypted_private_key_info,
       const std::vector<uint8_t>& subject_public_key_info);
 
   // Returns a copy of the object.
   std::unique_ptr<ECPrivateKey> Copy() const;
 
-  EVP_PKEY* key() { return key_; }
+  EVP_PKEY* key() { return key_.get(); }
 
   // Exports the private key to a PKCS #8 PrivateKeyInfo block.
   bool ExportPrivateKey(std::vector<uint8_t>* output) const;
 
   // Exports the private key as an ASN.1-encoded PKCS #8 EncryptedPrivateKeyInfo
   // block and the public key as an X.509 SubjectPublicKeyInfo block.
   // The |password| and |iterations| are used as inputs to the key derivation
   // function for generating the encryption key.  PKCS #5 recommends a minimum
   // of 1000 iterations, on modern systems a larger value may be preferrable.
   //
   // This function is deprecated. Use ExportPrivateKey for new code. See
   // https://crbug.com/603319.
   bool ExportEncryptedPrivateKey(const std::string& password,
                                  int iterations,
                                  std::vector<uint8_t>* output) const;
 
   // Exports the public key to an X.509 SubjectPublicKeyInfo block.
   bool ExportPublicKey(std::vector<uint8_t>* output) const;
 
   // Exports the public key as an EC point in the uncompressed point format.
   bool ExportRawPublicKey(std::string* output) const;
 
  private:
   // Constructor is private. Use one of the Create*() methods above instead.
   ECPrivateKey();
 
-  EVP_PKEY* key_;
+  bssl::UniquePtr<EVP_PKEY> key_;
 
   DISALLOW_COPY_AND_ASSIGN(ECPrivateKey);
 };
 
 
 }  // namespace crypto
 
 #endif  // CRYPTO_EC_PRIVATE_KEY_H_