diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 23:41:33 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 23:41:33 +0000 |
| commit | cdec478953b9b0bedace2af8fb05cfeaedd215b2 (patch) | |
| tree | 2d8570074d6a849fc33bb702c74857a3ea81e3a1 /net/ssl/ssl_config_service.cc | |
| parent | e2ebe33202fd6d03ec9766a914f45eae646924a5 (diff) | |
| download | chromium_src-cdec478953b9b0bedace2af8fb05cfeaedd215b2.zip chromium_src-cdec478953b9b0bedace2af8fb05cfeaedd215b2.tar.gz chromium_src-cdec478953b9b0bedace2af8fb05cfeaedd215b2.tar.bz2 | |
Revert 219882 "Turn off TLS 1.2 to work around the TLS 1.2 clien..."
219882 has been tested in 31.0.1614.0 (Official Build 220153) canary.
> Turn off TLS 1.2 to work around the TLS 1.2 client authentication
> problems on Android and Windows.
>
> R=agl@chromium.org
> TEST=net_unittests
>
> Review URL: https://chromiumcodereview.appspot.com/23442006
TBR=wtc@chromium.org
BUG=278370,280275
Review URL: https://codereview.chromium.org/23559012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ssl/ssl_config_service.cc')
| -rw-r--r-- | net/ssl/ssl_config_service.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc index c9d67fb..a2c34a2 100644 --- a/net/ssl/ssl_config_service.cc +++ b/net/ssl/ssl_config_service.cc @@ -20,13 +20,15 @@ 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_1) +#if defined(SSL_OP_NO_TLSv1_2) + SSL_PROTOCOL_VERSION_TLS1_2; +#elif defined(SSL_OP_NO_TLSv1_1) SSL_PROTOCOL_VERSION_TLS1_1; #else SSL_PROTOCOL_VERSION_TLS1; #endif #else - SSL_PROTOCOL_VERSION_TLS1_1; + SSL_PROTOCOL_VERSION_TLS1_2; #endif SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {} |