diff options
| author | mckev@amazon.com <mckev@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 05:18:02 +0000 |
|---|---|---|
| committer | mckev@amazon.com <mckev@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 05:18:02 +0000 |
| commit | 63e468645ea8c3f6fd8d5bc0af3b77b11736b5e7 (patch) | |
| tree | c9dae5f752d64f2cc16741794fbacee306c9b312 /net | |
| parent | daf5dde94d5b27b07ed531fa33923c636759de0e (diff) | |
| download | chromium_src-63e468645ea8c3f6fd8d5bc0af3b77b11736b5e7.zip chromium_src-63e468645ea8c3f6fd8d5bc0af3b77b11736b5e7.tar.gz chromium_src-63e468645ea8c3f6fd8d5bc0af3b77b11736b5e7.tar.bz2 | |
Allow close_notify during the SSL handshake to trigger TLS fallback on Android
R=wtc@chromium.org
BUG=308650
TEST=Visit https://www.auroragov.org and observe that it loads.
Review URL: https://codereview.chromium.org/81413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 549f4ed..ab021e7 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -163,6 +163,9 @@ int MapOpenSSLErrorSSL() { case SSL_R_INVALID_TICKET_KEYS_LENGTH: case SSL_R_KEY_ARG_TOO_LONG: case SSL_R_READ_WRONG_PACKET_TYPE: + // SSL_do_handshake reports this error when the server responds to a + // ClientHello with a fatal close_notify alert. + case SSL_AD_REASON_OFFSET + SSL_AD_CLOSE_NOTIFY: case SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE: // TODO(joth): SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE may be returned from the // server after receiving ClientHello if there's no common supported cipher. |