diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:55:17 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:55:17 +0000 |
| commit | 2d88e7d8b4c382e0ef178c52a87450c226150ef2 (patch) | |
| tree | b76d5921ed1ed5c2321570306779aab993f74568 /net/socket/ssl_client_socket_nss.cc | |
| parent | f7b2b6a665c130d4ca6b08fdec87b2fad3198f3d (diff) | |
| download | chromium_src-2d88e7d8b4c382e0ef178c52a87450c226150ef2.zip chromium_src-2d88e7d8b4c382e0ef178c52a87450c226150ef2.tar.gz chromium_src-2d88e7d8b4c382e0ef178c52a87450c226150ef2.tar.bz2 | |
Change SpdySession::GetSSLInfo to get the SSLInfo from the underlying socket
even if the session is not "secure". This required refactoring StreamSocket
to add WasNpnNegotiated() and GetSSLInfo() methods.
This allows for a change to SpdySession::GetSSLInfo to accurately return the correct SSLInfo in the case of SPDY Proxy sessions.
BUG=134690
TEST=\*DoNotUseSpdySessionIfCertDoesNotMatch\*
Review URL: https://chromiumcodereview.appspot.com/10690122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147479 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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 0c3ea4e..9d0eea2 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -2750,12 +2750,12 @@ void SSLClientSocket::ClearSessionCache() { SSL_ClearSessionCache(); } -void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { +bool SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { EnterFunction(""); ssl_info->Reset(); if (core_->state().server_cert_chain.empty() || !core_->state().server_cert_chain[0]) { - return; + return false; } ssl_info->cert_status = server_cert_verify_result_.cert_status; @@ -2791,6 +2791,7 @@ void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL; LeaveFunction(""); + return true; } void SSLClientSocketNSS::GetSSLCertRequestInfo( |