From 21a1a185448a3f9cd275933af3b41a4f94ea0cec Mon Sep 17 00:00:00 2001
From: "wtc@chromium.org"
<wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 20 Aug 2012 22:18:23 +0000
Subject: Revert 151198 - Turn off TLS 1.1.
Review URL: https://chromiumcodereview.appspot.com/10828272
Bug 141629 has been fixed. We can turn on TLS 1.1 on the trunk.
TBR=agl@chromium.org,rsleevi@chromium.org
BUG=142172
TEST=Visit https://www.google.com/ and https://www.facebook.com/.
Click the lock icon. The page info bubble should say
"The connection uses TLS 1.1."
Review URL: https://chromiumcodereview.appspot.com/10854212
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152404 0039d316-1c4b-4281-b951-d872f2087c98
---
net/socket/ssl_server_socket_unittest.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'net/socket/ssl_server_socket_unittest.cc')
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 5c3c5a7..f93d7c6 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -335,7 +335,7 @@ class SSLServerSocketTest : public PlatformTest {
ssl_config.false_start_enabled = false;
ssl_config.channel_id_enabled = false;
ssl_config.version_min = SSL_PROTOCOL_VERSION_SSL3;
- ssl_config.version_max = SSL_PROTOCOL_VERSION_TLS1;
+ ssl_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1;
// Certificate provided by the host doesn't need authority.
net::SSLConfig::CertAndStatus cert_and_status;
--
cgit v1.1