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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/ssl_config_service.cc

Issue 10854212: Revert 151198 - Turn off TLS 1.1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | net/socket/ssl_server_socket_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/ssl_config_service.cc
===================================================================
--- net/base/ssl_config_service.cc (revision 152261)
+++ net/base/ssl_config_service.cc (working copy)
@@ -18,7 +18,16 @@
static uint16 g_default_version_min = SSL_PROTOCOL_VERSION_SSL3;
-static uint16 g_default_version_max = SSL_PROTOCOL_VERSION_TLS1;
+static uint16 g_default_version_max =
+#if defined(USE_OPENSSL)
+#if defined(SSL_OP_NO_TLSv1_1)
+ SSL_PROTOCOL_VERSION_TLS1_1;
+#else
+ SSL_PROTOCOL_VERSION_TLS1;
+#endif
+#else
+ SSL_PROTOCOL_VERSION_TLS1_1;
+#endif
SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {}
« no previous file with comments | « no previous file | net/socket/ssl_server_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698