diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 18:07:15 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 18:07:15 +0000 |
commit | 2a6b362c7563d36cf99e3954baa14bb7f6578f6c (patch) | |
tree | 67e6e90cb5627612e8cd4232aa95826a8ca5d795 /net/base | |
parent | a54f8ed6c7d2609319568e085993410b8bf8303c (diff) | |
download | chromium_src-2a6b362c7563d36cf99e3954baa14bb7f6578f6c.zip chromium_src-2a6b362c7563d36cf99e3954baa14bb7f6578f6c.tar.gz chromium_src-2a6b362c7563d36cf99e3954baa14bb7f6578f6c.tar.bz2 |
Linux: Fallback to SSL if server closes early during TLS handshake.
BUG=http://crbug.com/14092
TEST=See bug for example TLS-intolerant server.
Review URL: http://codereview.chromium.org/131085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r-- | net/base/ssl_client_socket_nss.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/base/ssl_client_socket_nss.cc b/net/base/ssl_client_socket_nss.cc index d64d791..c48f0b0 100644 --- a/net/base/ssl_client_socket_nss.cc +++ b/net/base/ssl_client_socket_nss.cc @@ -691,7 +691,14 @@ int SSLClientSocketNSS::DoHandshakeRead() { // Done! } else { PRErrorCode prerr = PR_GetError(); - net_error = NetErrorFromNSPRError(prerr); + + // If the server closed on us, it is a protocol error. + // Some TLS-intolerant servers do this when we request TLS. + if (prerr == PR_END_OF_FILE_ERROR) { + net_error = ERR_SSL_PROTOCOL_ERROR; + } else { + net_error = NetErrorFromNSPRError(prerr); + } // If not done, stay in this state if (net_error == ERR_IO_PENDING) { |