summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-12 14:33:37 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-12 14:33:37 +0000
commit1ec0ff0063c663a01c7f7d5e37b3e46c7c840052 (patch)
tree5c65a41615d47a8f2f720ac4d30063012a19e98b /net/url_request
parent371c7cda5adab9d02bf99569409972b6456f7211 (diff)
downloadchromium_src-1ec0ff0063c663a01c7f7d5e37b3e46c7c840052.zip
chromium_src-1ec0ff0063c663a01c7f7d5e37b3e46c7c840052.tar.gz
chromium_src-1ec0ff0063c663a01c7f7d5e37b3e46c7c840052.tar.bz2
Turn off TLS 1.1.
This change is intended to be merged to the 1180 branch for Chrome 21 Stable. On the trunk this change is only temporary and will be replaced by a fix for bug 141629. R=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.0." Review URL: https://chromiumcodereview.appspot.com/10828272 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_unittest.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 0178d37..8ff168c 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1795,10 +1795,6 @@ TEST_F(HTTPSRequestTest, SSLv3Fallback) {
// than necessary.
TEST_F(HTTPSRequestTest, TLSv1Fallback) {
uint16 default_version_max = SSLConfigService::default_version_max();
- // The OpenSSL library in use may not support TLS 1.1.
-#if !defined(USE_OPENSSL)
- EXPECT_GT(default_version_max, SSL_PROTOCOL_VERSION_TLS1);
-#endif
if (default_version_max <= SSL_PROTOCOL_VERSION_TLS1)
return;