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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/cert/cert_database_openssl.cc

Issue 361193003: Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review feedback Created 6 years, 5 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
« crypto/scoped_openssl_types.h ('K') | « net/base/openssl_private_key_store_android.cc ('k') | net/cert/cert_verify_proc_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/cert_database_openssl.cc
diff --git a/net/cert/cert_database_openssl.cc b/net/cert/cert_database_openssl.cc
index 23b64cc256f0dab4820aee90660e481435a7fec9..a67ac1be5fe77364130671ceb3c9710862c48cf7 100644
--- a/net/cert/cert_database_openssl.cc
+++ b/net/cert/cert_database_openssl.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/observer_list_threadsafe.h"
-#include "crypto/openssl_util.h"
+#include "crypto/scoped_openssl_types.h"
#include "net/base/crypto_module.h"
#include "net/base/net_errors.h"
#include "net/base/openssl_private_key_store.h"
@@ -40,7 +40,7 @@ int CertDatabase::CheckUserCert(X509Certificate* cert) {
return ERR_CERT_DATE_INVALID;
// X509_PUBKEY_get() transfers ownership, not X509_get_X509_PUBKEY()
- crypto::ScopedOpenSSL<EVP_PKEY, EVP_PKEY_free> public_key(
+ crypto::ScopedEVP_PKEY public_key(
X509_PUBKEY_get(X509_get_X509_PUBKEY(cert->os_cert_handle())));
if (!OpenSSLPrivateKeyStore::HasPrivateKey(public_key.get()))
« crypto/scoped_openssl_types.h ('K') | « net/base/openssl_private_key_store_android.cc ('k') | net/cert/cert_verify_proc_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698