Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

net/quic/crypto/p256_key_exchange_openssl.cc

 // Copyright (c) 2013 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 "net/quic/crypto/p256_key_exchange.h"
 
 #include <openssl/ec.h>
 #include <openssl/ecdh.h>
 #include <openssl/evp.h>
 
@@ skipping 12 matching lines @@
 P256KeyExchange::~P256KeyExchange() {}
 
 // static
 P256KeyExchange* P256KeyExchange::New(StringPiece key) {
   if (key.empty()) {
     DVLOG(1) << "Private key is empty";
     return NULL;
   }
 
   const uint8* keyp = reinterpret_cast<const uint8*>(key.data());
-  crypto::ScopedOpenSSL<EC_KEY, EC_KEY_free> private_key(
-      d2i_ECPrivateKey(NULL, &keyp, key.size()));
+  crypto::ScopedEC_KEY private_key(d2i_ECPrivateKey(NULL, &keyp, key.size()));
   if (!private_key.get() || !EC_KEY_check_key(private_key.get())) {
     DVLOG(1) << "Private key is invalid.";
     return NULL;
   }
 
   uint8 public_key[kUncompressedP256PointBytes];
   if (EC_POINT_point2oct(EC_KEY_get0_group(private_key.get()),
                          EC_KEY_get0_public_key(private_key.get()),
                          POINT_CONVERSION_UNCOMPRESSED, public_key,
                          sizeof(public_key), NULL) != sizeof(public_key)) {
     DVLOG(1) << "Can't get public key.";
     return NULL;
   }
 
   return new P256KeyExchange(private_key.release(), public_key);
 }
 
 // static
 string P256KeyExchange::NewPrivateKey() {
-  crypto::ScopedOpenSSL<EC_KEY, EC_KEY_free> key(
-      EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
+  crypto::ScopedEC_KEY key(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
   if (!key.get() || !EC_KEY_generate_key(key.get())) {
     DVLOG(1) << "Can't generate a new private key.";
     return string();
   }
 
   int key_len = i2d_ECPrivateKey(key.get(), NULL);
   if (key_len <= 0) {
     DVLOG(1) << "Can't convert private key to string";
     return string();
   }
@@ skipping 12 matching lines @@
   return P256KeyExchange::New(private_value);
 }
 
 bool P256KeyExchange::CalculateSharedKey(const StringPiece& peer_public_value,
                                          string* out_result) const {
   if (peer_public_value.size() != kUncompressedP256PointBytes) {
     DVLOG(1) << "Peer public value is invalid";
     return false;
   }
 
-  crypto::ScopedOpenSSL<EC_POINT, EC_POINT_free> point(
+  crypto::ScopedOpenSSL<EC_POINT, EC_POINT_free>::Type point(
       EC_POINT_new(EC_KEY_get0_group(private_key_.get())));
   if (!point.get() ||
       !EC_POINT_oct2point( /* also test if point is on curve */
           EC_KEY_get0_group(private_key_.get()),
           point.get(),
           reinterpret_cast<const uint8*>(peer_public_value.data()),
           peer_public_value.size(), NULL)) {
     DVLOG(1) << "Can't convert peer public value to curve point.";
     return false;
   }
@@ skipping 11 matching lines @@
 
 StringPiece P256KeyExchange::public_value() const {
   return StringPiece(reinterpret_cast<const char*>(public_key_),
                      sizeof(public_key_));
 }
 
 QuicTag P256KeyExchange::tag() const { return kP256; }
 
 }  // namespace net