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

Unified Diff: net/socket/ssl_client_socket_impl.h

Issue 2400033005: Use BoringSSL scopers in //net. (Closed)
Patch Set: eroman comments Created 4 years, 2 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
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.cc ('k') | net/socket/ssl_client_socket_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_impl.h
diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
index 5c9b2945312bcef5c59a4437ecdb98cb78e4335c..ff235ed4bdfa0bd771c6cf326f1bdbabba5dfaab 100644
--- a/net/socket/ssl_client_socket_impl.h
+++ b/net/socket/ssl_client_socket_impl.h
@@ -29,7 +29,6 @@
#include "net/socket/ssl_client_socket.h"
#include "net/ssl/channel_id_service.h"
#include "net/ssl/openssl_ssl_util.h"
-#include "net/ssl/scoped_openssl_types.h"
#include "net/ssl/ssl_client_cert_type.h"
#include "net/ssl/ssl_config_service.h"
@@ -336,8 +335,8 @@ class SSLClientSocketImpl : public SSLClientSocket {
TokenBindingSignatureMap tb_signature_map_;
// OpenSSL stuff
- SSL* ssl_;
- BIO* transport_bio_;
+ bssl::UniquePtr<SSL> ssl_;
+ bssl::UniquePtr<BIO> transport_bio_;
std::unique_ptr<ClientSocketHandle> transport_;
const HostPortPair host_and_port_;
@@ -368,7 +367,7 @@ class SSLClientSocketImpl : public SSLClientSocket {
bool channel_id_sent_;
// If non-null, the newly-established to be inserted into the session cache
// once certificate verification is done.
- ScopedSSL_SESSION pending_session_;
+ bssl::UniquePtr<SSL_SESSION> pending_session_;
// True if the initial handshake's certificate has been verified.
bool certificate_verified_;
// Set to true if a CertificateRequest was received.
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.cc ('k') | net/socket/ssl_client_socket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698