summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 19:47:47 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 19:47:47 +0000
commit5ff5d539c420dd888d75c3e3c662f66ac24786e6 (patch)
tree084189ee1fb6722ec2df43853616e3f01253a8bc
parent238152e3fa99f34131fab18e6a2bf667358f7455 (diff)
downloadchromium_src-5ff5d539c420dd888d75c3e3c662f66ac24786e6.zip
chromium_src-5ff5d539c420dd888d75c3e3c662f66ac24786e6.tar.gz
chromium_src-5ff5d539c420dd888d75c3e3c662f66ac24786e6.tar.bz2
Allow ERR_CONNECTION_RESET during the SSL handshake to trigger a
TLS 1.1 -> TLS 1.0 fallback. R=agl@chromium.org,rsleevi@chromium.org BUG=130293,126340 TEST=none Review URL: https://chromiumcodereview.appspot.com/10493003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141941 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/socket/ssl_client_socket_nss.cc17
1 files changed, 17 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index bf1580d..ba49875 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -2103,6 +2103,23 @@ int SSLClientSocketNSS::Core::DoHandshake() {
PRErrorCode prerr = PR_GetError();
net_error = HandleNSSError(prerr, true);
+ // Some network devices that inspect application-layer packets seem to
+ // inject TCP reset packets to break the connections when they see
+ // TLS 1.1 in ClientHello or ServerHello. See http://crbug.com/130293.
+ //
+ // Only allow ERR_CONNECTION_RESET to trigger a TLS 1.1 -> TLS 1.0
+ // fallback. We don't lose much in this fallback because the explicit
+ // IV for CBC mode in TLS 1.1 is approximated by record splitting in
+ // TLS 1.0.
+ //
+ // ERR_CONNECTION_RESET is a common network error, so we don't want it
+ // to trigger a version fallback in general, especially the TLS 1.0 ->
+ // SSL 3.0 fallback, which would drop TLS extensions.
+ if (prerr == PR_CONNECT_RESET_ERROR &&
+ ssl_config_.version_max == SSL_PROTOCOL_VERSION_TLS1_1) {
+ net_error = ERR_SSL_PROTOCOL_ERROR;
+ }
+
// If not done, stay in this state
if (net_error == ERR_IO_PENDING) {
GotoState(STATE_HANDSHAKE);