| 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..7a1ce167fc67b778e9e2609a33821dbe9fd03692 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(
|
| + crypto::ScopedOpenSSL<SSL_CTX, SSL_CTX_free>::Type 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()));
|
| + crypto::ScopedOpenSSL<X509, X509_free>::Type x509(
|
| + d2i_X509(NULL, &der_string_array, der_string.length()));
|
| if (!x509.get())
|
| return ERR_UNEXPECTED;
|
|
|
|
|