diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 13:45:12 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 13:45:12 +0000 |
| commit | 8c9d4ba6af47099c5ce030d0802b276cd8fd37b2 (patch) | |
| tree | 8fb914c374db9631a749475180036df83e2ed9a9 /net/socket/ssl_client_socket_nss.cc | |
| parent | 971888bc3cefb8dc5538c7785a4b2c82f706a2a5 (diff) | |
| download | chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.zip chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.tar.gz chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.tar.bz2 | |
Revert 62918 - net: clean up SSLHostInfo construction.
Create an SSLHostInfoFactory interface and plumb it from the HttpCache
to the SSLConnectJob. Also, move the SSLHostInfo reference from the
ssl_config to being passed to the SSLClientSocket.
BUG=none
TEST=net_unittests
Review URL: http://codereview.chromium.org/3747003
TBR=agl@chromium.org
Review URL: http://codereview.chromium.org/3846005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 95458fa..39a2774 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -400,8 +400,7 @@ HCERTSTORE SSLClientSocketNSS::cert_store_ = NULL; SSLClientSocketNSS::SSLClientSocketNSS(ClientSocketHandle* transport_socket, const std::string& hostname, - const SSLConfig& ssl_config, - SSLHostInfo* ssl_host_info) + const SSLConfig& ssl_config) : ALLOW_THIS_IN_INITIALIZER_LIST(buffer_send_callback_( this, &SSLClientSocketNSS::BufferSendComplete)), ALLOW_THIS_IN_INITIALIZER_LIST(buffer_recv_callback_( @@ -432,8 +431,7 @@ SSLClientSocketNSS::SSLClientSocketNSS(ClientSocketHandle* transport_socket, nss_bufs_(NULL), net_log_(transport_socket->socket()->NetLog()), predicted_npn_status_(kNextProtoUnsupported), - predicted_npn_proto_used_(false), - ssl_host_info_(ssl_host_info) { + predicted_npn_proto_used_(false) { EnterFunction(""); } @@ -469,9 +467,9 @@ static const uint8 kSnapStartInfoVersion = 0; // SaveSnapStartInfo serialises the information needed to perform a Snap Start // with this server in the future (if any) and tells -// |ssl_host_info_| to preserve it. +// |ssl_config_.ssl_host_info| to preserve it. void SSLClientSocketNSS::SaveSnapStartInfo() { - if (!ssl_host_info_.get()) + if (!ssl_config_.ssl_host_info.get()) return; SECStatus rv; @@ -594,7 +592,7 @@ void SSLClientSocketNSS::SaveSnapStartInfo() { DCHECK_EQ(j, len); LOG(ERROR) << "Setting Snap Start info " << hostname_ << " " << len; - ssl_host_info_->Set(std::string( + ssl_config_.ssl_host_info->Set(std::string( reinterpret_cast<const char *>(&data[0]), len)); CERT_DestroyCertList(cert_list); @@ -738,7 +736,7 @@ int SSLClientSocketNSS::Connect(CompletionCallback* callback) { return rv; } - if (ssl_config_.snap_start_enabled && ssl_host_info_.get()) { + if (ssl_config_.snap_start_enabled && ssl_config_.ssl_host_info.get()) { GotoState(STATE_SNAP_START_LOAD_INFO); } else { GotoState(STATE_HANDSHAKE); @@ -1971,12 +1969,12 @@ void SSLClientSocketNSS::HandshakeCallback(PRFileDesc* socket, int SSLClientSocketNSS::DoSnapStartLoadInfo() { EnterFunction(""); - int rv = ssl_host_info_->WaitForDataReady(&handshake_io_callback_); + int rv = ssl_config_.ssl_host_info->WaitForDataReady(&handshake_io_callback_); if (rv == OK) { LOG(ERROR) << "SSL host info size " << hostname_ << " " - << ssl_host_info_->data().size(); - if (LoadSnapStartInfo(ssl_host_info_->data())) { + << ssl_config_.ssl_host_info->data().size(); + if (LoadSnapStartInfo(ssl_config_.ssl_host_info->data())) { pseudo_connected_ = true; GotoState(STATE_SNAP_START_WAIT_FOR_WRITE); if (user_connect_callback_) |