Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: net/cert/cert_verify_proc_openssl.cc

Issue 361193003: Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android fixes Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698