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

Unified Diff: net/socket_stream/socket_stream.cc

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar call sites. Created 7 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_stream/socket_stream.cc
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 2b3b94108867a7ea9e7375583ccda2ff1ce0fb3a..536ff9c53559793091703bf5f4b9673ef8a4cb9f 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -94,6 +94,7 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate)
next_state_(STATE_NONE),
host_resolver_(NULL),
cert_verifier_(NULL),
+ transport_security_state_(NULL),
server_bound_cert_service_(NULL),
factory_(ClientSocketFactory::GetDefaultFactory()),
proxy_mode_(kDirectConnection),
@@ -159,6 +160,7 @@ void SocketStream::set_context(const URLRequestContext* context) {
if (context_) {
host_resolver_ = context_->host_resolver();
cert_verifier_ = context_->cert_verifier();
+ transport_security_state_ = context_->transport_security_state();
server_bound_cert_service_ = context_->server_bound_cert_service();
}
}
@@ -992,6 +994,7 @@ int SocketStream::DoSecureProxyConnect() {
DCHECK(factory_);
SSLClientSocketContext ssl_context;
ssl_context.cert_verifier = cert_verifier_;
+ ssl_context.transport_security_state = transport_security_state_;
ssl_context.server_bound_cert_service = server_bound_cert_service_;
socket_.reset(factory_->CreateSSLClientSocket(
socket_.release(),
@@ -1045,6 +1048,7 @@ int SocketStream::DoSSLConnect() {
DCHECK(factory_);
SSLClientSocketContext ssl_context;
ssl_context.cert_verifier = cert_verifier_;
+ ssl_context.transport_security_state = transport_security_state_;
ssl_context.server_bound_cert_service = server_bound_cert_service_;
socket_.reset(factory_->CreateSSLClientSocket(socket_.release(),
HostPortPair::FromURL(url_),

Powered by Google App Engine
This is Rietveld 408576698