summaryrefslogtreecommitdiffstats
path: root/net/ssl
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-28 01:54:03 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-28 01:54:03 +0000
commit308ad4130b3cd5f73f67e902ed8ace5e85f078a5 (patch)
tree1021346915d0ba2e2d85d5b0c33b07a7b2502047 /net/ssl
parentf64622626b98eaeb7d52a2c163d61cb43f1a4472 (diff)
downloadchromium_src-308ad4130b3cd5f73f67e902ed8ace5e85f078a5.zip
chromium_src-308ad4130b3cd5f73f67e902ed8ace5e85f078a5.tar.gz
chromium_src-308ad4130b3cd5f73f67e902ed8ace5e85f078a5.tar.bz2
Turn off TLS 1.2 to work around the TLS 1.2 client authentication
problems on Android and Windows. R=agl@chromium.org BUG=278370 TEST=net_unittests Review URL: https://chromiumcodereview.appspot.com/23442006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ssl')
-rw-r--r--net/ssl/ssl_config_service.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc
index a2c34a2..c9d67fb 100644
--- a/net/ssl/ssl_config_service.cc
+++ b/net/ssl/ssl_config_service.cc
@@ -20,15 +20,13 @@ static uint16 g_default_version_min = SSL_PROTOCOL_VERSION_SSL3;
static uint16 g_default_version_max =
#if defined(USE_OPENSSL)
-#if defined(SSL_OP_NO_TLSv1_2)
- SSL_PROTOCOL_VERSION_TLS1_2;
-#elif defined(SSL_OP_NO_TLSv1_1)
+#if defined(SSL_OP_NO_TLSv1_1)
SSL_PROTOCOL_VERSION_TLS1_1;
#else
SSL_PROTOCOL_VERSION_TLS1;
#endif
#else
- SSL_PROTOCOL_VERSION_TLS1_2;
+ SSL_PROTOCOL_VERSION_TLS1_1;
#endif
SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {}