Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

net/cert/x509_util_openssl_unittest.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 "base/memory/scoped_ptr.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/openssl_util.h"
+#include "crypto/scoped_openssl_types.h"
 #include "net/cert/x509_util.h"
 #include "net/cert/x509_util_openssl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
+typedef crypto::ScopedOpenSSL<X509, X509_free>::Type ScopedX509;
+
 // Verify that a given certificate was signed with the private key corresponding
 // to a given public key.
 // |der_cert| is the DER-encoded X.509 certificate.
 // |der_spki| is the DER-encoded public key of the signer.
 void VerifyCertificateSignature(const std::string& der_cert,
                                 const std::vector<uint8>& der_spki) {
   const unsigned char* cert_data =
       reinterpret_cast<const unsigned char*>(der_cert.data());
   int cert_data_len = static_cast<int>(der_cert.size());
-  crypto::ScopedOpenSSL<X509, X509_free> cert(
-      d2i_X509(NULL, &cert_data, cert_data_len));
+  ScopedX509 cert(d2i_X509(NULL, &cert_data, cert_data_len));
   ASSERT_TRUE(cert.get());
 
   // NOTE: SignatureVerifier wants the DER-encoded ASN.1 AlgorithmIdentifier
   // but there is no OpenSSL API to extract it from an X509 object (!?)
   // Use X509_verify() directly instead, which takes an EVP_PKEY.
   const unsigned char* pub_key_data = &der_spki.front();
   int pub_key_len = static_cast<int>(der_spki.size());
-  crypto::ScopedOpenSSL<EVP_PKEY, EVP_PKEY_free> pub_key(
-      d2i_PUBKEY(NULL, &pub_key_data, pub_key_len));
+  crypto::ScopedEVP_PKEY pub_key(d2i_PUBKEY(NULL, &pub_key_data, pub_key_len));
   ASSERT_TRUE(pub_key.get());
 
   // NOTE: X509_verify() returns 1 in case of succes, 0 or -1 on error.
   EXPECT_EQ(1, X509_verify(cert.get(), pub_key.get()));
 }
 
 // Verify the attributes of a domain-bound certificate.
 // |domain| is the bound domain name.
 // |der_cert| is the DER-encoded X.509 certificate.
 void VerifyDomainBoundCert(const std::string& domain,
                            const std::string& der_cert) {
   // Origin Bound Cert OID.
   static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
-  crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free> oid_obj(
+  crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free>::Type oid_obj(
       OBJ_txt2obj(oid_string, 0));
   ASSERT_TRUE(oid_obj.get());
 
   const unsigned char* cert_data =
       reinterpret_cast<const unsigned char*>(der_cert.data());
   int cert_data_len = static_cast<int>(der_cert.size());
-  crypto::ScopedOpenSSL<X509, X509_free> cert(
-      d2i_X509(NULL, &cert_data, cert_data_len));
+  ScopedX509 cert(d2i_X509(NULL, &cert_data, cert_data_len));
   ASSERT_TRUE(cert.get());
 
   // Find the extension.
   int ext_pos = X509_get_ext_by_OBJ(cert.get(), oid_obj.get(), -1);
   ASSERT_NE(-1, ext_pos);
   X509_EXTENSION* ext = X509_get_ext(cert.get(), ext_pos);
   ASSERT_TRUE(ext);
 
   // Check its value, it must be an ASN.1 IA5STRING
   // Which means <tag> <length> <domain>, with:
@@ skipping 63 matching lines @@
 
   VerifyDomainBoundCert(domain, der_cert);
 
   // signature_verifier_win and signature_verifier_mac can't handle EC certs.
   std::vector<uint8> spki;
   ASSERT_TRUE(private_key->ExportPublicKey(&spki));
   VerifyCertificateSignature(der_cert, spki);
 }
 
 }  // namespace net