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

Unified Diff: net/socket/ssl_server_socket_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/socket/ssl_server_socket_openssl.cc
diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc
index f6bd0cd8f819198c31d6eabcf677d5508b71b4be..91a71b330ae0aeb82ca9b8c9bb161ec1a9da6a9c 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "crypto/openssl_util.h"
#include "crypto/rsa_private_key.h"
+#include "crypto/scoped_openssl_types.h"
#include "net/base/net_errors.h"
#include "net/socket/openssl_ssl_util.h"
#include "net/socket/ssl_error_params.h"
@@ -598,7 +599,7 @@ int SSLServerSocketOpenSSL::Init() {
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
- crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free> ssl_ctx(
+ scoped_ptr<SSL_CTX, crypto::OpenSSLDestroyer<SSL_CTX, SSL_CTX_free> > ssl_ctx(
// It support SSLv2, SSLv3, and TLSv1.
SSL_CTX_new(SSLv23_server_method()));
ssl_ = SSL_new(ssl_ctx.get());
@@ -630,8 +631,8 @@ int SSLServerSocketOpenSSL::Init() {
const unsigned char* der_string_array =
reinterpret_cast<const unsigned char*>(der_string.data());
- crypto::ScopedOpenSSL<X509, X509_free>
- x509(d2i_X509(NULL, &der_string_array, der_string.length()));
+ scoped_ptr<X509, crypto::OpenSSLDestroyer<X509, X509_free> > x509(
+ d2i_X509(NULL, &der_string_array, der_string.length()));
if (!x509.get())
return ERR_UNEXPECTED;

Powered by Google App Engine
This is Rietveld 408576698