Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/net/ssl/ssl_config_service.cc

Issue 17553016: Revert 207759 "Disable TLS 1.2 if USE_OPENSSL is defined (such a..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/net/ssl/ssl_config_service.cc
===================================================================
--- trunk/src/net/ssl/ssl_config_service.cc (revision 208088)
+++ trunk/src/net/ssl/ssl_config_service.cc (working copy)
@@ -20,9 +20,9 @@
static uint16 g_default_version_max =
#if defined(USE_OPENSSL)
-// TODO(wtc): do not enable TLS 1.2 until we can keep ClientHello under 256
-// bytes. See http://crbug.com/245500 and http://crbug.com/247691.
-#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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698