Index: net/cert/cert_verify_proc_openssl.cc |
diff --git a/net/cert/cert_verify_proc_openssl.cc b/net/cert/cert_verify_proc_openssl.cc |
index 0f21daa13f3c78a39b6dd7418f5b690389829374..22365409c53717c0e6c5903f3fe22cf82357edfd 100644 |
--- a/net/cert/cert_verify_proc_openssl.cc |
+++ b/net/cert/cert_verify_proc_openssl.cc |
@@ -12,6 +12,7 @@ |
#include "base/logging.h" |
#include "base/sha1.h" |
#include "crypto/openssl_util.h" |
+#include "crypto/scoped_openssl_types.h" |
#include "crypto/sha2.h" |
#include "net/base/net_errors.h" |
#include "net/cert/asn1_util.h" |
@@ -197,11 +198,13 @@ int CertVerifyProcOpenSSL::VerifyInternal( |
verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID; |
} |
- crypto::ScopedOpenSSL<X509_STORE_CTX, X509_STORE_CTX_free> ctx( |
- X509_STORE_CTX_new()); |
+ scoped_ptr<X509_STORE_CTX, |
+ crypto::OpenSSLDestroyer<X509_STORE_CTX, X509_STORE_CTX_free> > |
+ ctx(X509_STORE_CTX_new()); |
- crypto::ScopedOpenSSL<STACK_OF(X509), sk_X509_free_fn> intermediates( |
- sk_X509_new_null()); |
+ scoped_ptr<STACK_OF(X509), |
+ crypto::OpenSSLDestroyer<STACK_OF(X509), sk_X509_free_fn> > |
+ intermediates(sk_X509_new_null()); |
if (!intermediates.get()) |
return ERR_OUT_OF_MEMORY; |