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_win.h | |
| 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_win.h')
| -rw-r--r-- | net/socket/ssl_client_socket_win.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_win.h b/net/socket/ssl_client_socket_win.h index 9013a9e..f5c0a4d 100644 --- a/net/socket/ssl_client_socket_win.h +++ b/net/socket/ssl_client_socket_win.h @@ -45,7 +45,6 @@ class SSLClientSocketWin : public SSLClientSocket { ~SSLClientSocketWin(); // SSLClientSocket implementation. - virtual void GetSSLInfo(SSLInfo* ssl_info); virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info); virtual int ExportKeyingMaterial(const base::StringPiece& label, bool has_context, @@ -70,6 +69,7 @@ class SSLClientSocketWin : public SSLClientSocket { virtual bool UsingTCPFastOpen() const OVERRIDE; virtual int64 NumBytesRead() const OVERRIDE; virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE; + virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, |