Index: net/quic/crypto/channel_id_openssl.cc |
diff --git a/net/quic/crypto/channel_id_openssl.cc b/net/quic/crypto/channel_id_openssl.cc |
index 241acae4941fd0df80a2b4755add13ed6b0ea6d9..a4d19dfc900113963610ec98ccd67ec3bb451147 100644 |
--- a/net/quic/crypto/channel_id_openssl.cc |
+++ b/net/quic/crypto/channel_id_openssl.cc |
@@ -11,6 +11,7 @@ |
#include <openssl/sha.h> |
#include "crypto/openssl_util.h" |
+#include "crypto/scoped_openssl_types.h" |
using base::StringPiece; |
@@ -33,14 +34,13 @@ bool ChannelIDVerifier::VerifyRaw(StringPiece key, |
return false; |
} |
- crypto::ScopedOpenSSL<EC_GROUP, EC_GROUP_free> p256( |
+ scoped_ptr<EC_GROUP, crypto::OpenSSLDestroyer<EC_GROUP, EC_GROUP_free> > p256( |
EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1)); |
if (p256.get() == NULL) { |
return false; |
} |
- crypto::ScopedOpenSSL<BIGNUM, BN_free> x(BN_new()), y(BN_new()), |
- r(BN_new()), s(BN_new()); |
+ crypto::ScopedBIGNUM x(BN_new()), y(BN_new()), r(BN_new()), s(BN_new()); |
ECDSA_SIG sig; |
sig.r = r.get(); |
@@ -57,15 +57,15 @@ bool ChannelIDVerifier::VerifyRaw(StringPiece key, |
return false; |
} |
- crypto::ScopedOpenSSL<EC_POINT, EC_POINT_free> point( |
- EC_POINT_new(p256.get())); |
+ scoped_ptr<EC_POINT, crypto::OpenSSLDestroyer<EC_POINT, EC_POINT_free> > |
+ point(EC_POINT_new(p256.get())); |
if (point.get() == NULL || |
!EC_POINT_set_affine_coordinates_GFp(p256.get(), point.get(), x.get(), |
y.get(), NULL)) { |
return false; |
} |
- crypto::ScopedOpenSSL<EC_KEY, EC_KEY_free> ecdsa_key(EC_KEY_new()); |
+ crypto::ScopedEC_KEY ecdsa_key(EC_KEY_new()); |
if (ecdsa_key.get() == NULL || |
!EC_KEY_set_group(ecdsa_key.get(), p256.get()) || |
!EC_KEY_set_public_key(ecdsa_key.get(), point.get())) { |