Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

crypto/ec_private_key_openssl.cc

 // 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.
 
 #include "crypto/ec_private_key.h"
 
 #include <openssl/ec.h>
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 #include <openssl/x509.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "crypto/openssl_util.h"
+#include "crypto/scoped_openssl_types.h"
 
 namespace crypto {
 
 namespace {
 
 // Function pointer definition, for injecting the required key export function
 // into ExportKeyWithBio, below. |bio| is a temporary memory BIO object, and
 // |key| is a handle to the input key object. Return 1 on success, 0 otherwise.
 // NOTE: Used with OpenSSL functions, which do not comply with the Chromium
 //       style guide, hence the unusual parameter placement / types.
 typedef int (*ExportBioFunction)(BIO* bio, const void* key);
 
+typedef scoped_ptr<PKCS8_PRIV_KEY_INFO,
+                   OpenSSLDestroyer<PKCS8_PRIV_KEY_INFO,
+                                    PKCS8_PRIV_KEY_INFO_free> >
+    ScopedPKCS8_PRIV_KEY_INFO;
+typedef scoped_ptr<X509_SIG, OpenSSLDestroyer<X509_SIG, X509_SIG_free> >
+    ScopedX509_SIG;
+
 // Helper to export |key| into |output| via the specified ExportBioFunction.
 bool ExportKeyWithBio(const void* key,
                       ExportBioFunction export_fn,
                       std::vector<uint8>* output) {
   if (!key)
     return false;
 
-  ScopedOpenSSL<BIO, BIO_free_all> bio(BIO_new(BIO_s_mem()));
+  ScopedBIO bio(BIO_new(BIO_s_mem()));
   if (!bio.get())
     return false;
 
   if (!export_fn(bio.get(), key))
     return false;
 
   char* data = NULL;
   long len = BIO_get_mem_data(bio.get(), &data);
   if (!data || len < 0)
     return false;
@@ skipping 35 matching lines @@
     EVP_PKEY_free(key_);
 }
 
 // static
 bool ECPrivateKey::IsSupported() { return true; }
 
 // static
 ECPrivateKey* ECPrivateKey::Create() {
   OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-  ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(
+  ScopedEC_KEY ec_key(
       EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
   if (!ec_key.get() || !EC_KEY_generate_key(ec_key.get()))
     return NULL;
 
   scoped_ptr<ECPrivateKey> result(new ECPrivateKey());
   result->key_ = EVP_PKEY_new();
   if (!result->key_ || !EVP_PKEY_set1_EC_KEY(result->key_, ec_key.get()))
     return NULL;
 
   CHECK_EQ(EVP_PKEY_EC, EVP_PKEY_type(result->key_->type));
@@ skipping 10 matching lines @@
   // as a lookup key when storing the private one in its store).
   if (encrypted_private_key_info.empty())
     return NULL;
 
   OpenSSLErrStackTracer err_tracer(FROM_HERE);
   // Write the encrypted private key into a memory BIO.
   char* private_key_data = reinterpret_cast<char*>(
       const_cast<uint8*>(&encrypted_private_key_info[0]));
   int private_key_data_len =
       static_cast<int>(encrypted_private_key_info.size());
-  ScopedOpenSSL<BIO, BIO_free_all> bio(
+  ScopedBIO bio(
       BIO_new_mem_buf(private_key_data, private_key_data_len));
   if (!bio.get())
     return NULL;
 
   // Convert it, then decrypt it into a PKCS#8 object.
-  ScopedOpenSSL<X509_SIG, X509_SIG_free> p8_encrypted(
-      d2i_PKCS8_bio(bio.get(), NULL));
+  ScopedX509_SIG p8_encrypted(d2i_PKCS8_bio(bio.get(), NULL));
   if (!p8_encrypted.get())
     return NULL;
 
-  ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> p8_decrypted(
-      PKCS8_decrypt(p8_encrypted.get(),
-                    password.c_str(),
-                    static_cast<int>(password.size())));
+  ScopedPKCS8_PRIV_KEY_INFO p8_decrypted(PKCS8_decrypt(
+      p8_encrypted.get(), password.c_str(), static_cast<int>(password.size())));
   if (!p8_decrypted.get() && password.empty()) {
     // Hack for reading keys generated by ec_private_key_nss. Passing NULL
     // causes OpenSSL to use an empty password instead of "\0\0".
     p8_decrypted.reset(PKCS8_decrypt(p8_encrypted.get(), NULL, 0));
   }
   if (!p8_decrypted.get())
     return NULL;
 
   // Create a new EVP_PKEY for it.
   scoped_ptr<ECPrivateKey> result(new ECPrivateKey);
   result->key_ = EVP_PKCS82PKEY(p8_decrypted.get());
   if (!result->key_ || EVP_PKEY_type(result->key_->type) != EVP_PKEY_EC)
     return NULL;
 
   return result.release();
 }
 
 bool ECPrivateKey::ExportEncryptedPrivateKey(
     const std::string& password,
     int iterations,
     std::vector<uint8>* output) {
   OpenSSLErrStackTracer err_tracer(FROM_HERE);
   // Convert into a PKCS#8 object.
-  ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> pkcs8(
-      EVP_PKEY2PKCS8(key_));
+  ScopedPKCS8_PRIV_KEY_INFO pkcs8(EVP_PKEY2PKCS8(key_));
   if (!pkcs8.get())
     return false;
 
   // Encrypt the object.
   // NOTE: NSS uses SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC
   // so use NID_pbe_WithSHA1And3_Key_TripleDES_CBC which should be the OpenSSL
   // equivalent.
-  ScopedOpenSSL<X509_SIG, X509_SIG_free> encrypted(
-      PKCS8_encrypt(NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
-                    NULL,
-                    password.c_str(),
-                    static_cast<int>(password.size()),
-                    NULL,
-                    0,
-                    iterations,
-                    pkcs8.get()));
+  ScopedX509_SIG encrypted(PKCS8_encrypt(NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
+                                         NULL,
+                                         password.c_str(),
+                                         static_cast<int>(password.size()),
+                                         NULL,
+                                         0,
+                                         iterations,
+                                         pkcs8.get()));
   if (!encrypted.get())
     return false;
 
   // Write it into |*output|
   return ExportKeyWithBio(encrypted.get(),
                           reinterpret_cast<ExportBioFunction>(i2d_PKCS8_bio),
                           output);
 }
 
 bool ECPrivateKey::ExportPublicKey(std::vector<uint8>* output) {
@@ skipping 17 matching lines @@
   len = i2d_PublicKey(key_, &derp);
   if (len != kExpectedKeyLength)
     return false;
 
   output->assign(reinterpret_cast<char*>(buf + 1), kExpectedKeyLength - 1);
   return true;
 }
 
 bool ECPrivateKey::ExportValue(std::vector<uint8>* output) {
   OpenSSLErrStackTracer err_tracer(FROM_HERE);
-  ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(EVP_PKEY_get1_EC_KEY(key_));
+  ScopedEC_KEY ec_key(EVP_PKEY_get1_EC_KEY(key_));
   return ExportKey(ec_key.get(),
                    reinterpret_cast<ExportDataFunction>(i2d_ECPrivateKey),
                    output);
 }
 
 bool ECPrivateKey::ExportECParams(std::vector<uint8>* output) {
   OpenSSLErrStackTracer err_tracer(FROM_HERE);
-  ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(EVP_PKEY_get1_EC_KEY(key_));
+  ScopedEC_KEY ec_key(EVP_PKEY_get1_EC_KEY(key_));
   return ExportKey(ec_key.get(),
                    reinterpret_cast<ExportDataFunction>(i2d_ECParameters),
                    output);
 }
 
 ECPrivateKey::ECPrivateKey() : key_(NULL) {}
 
 }  // namespace crypto