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

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 1422293002: Remove RC4 by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 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
Index: net/socket/ssl_client_socket_openssl.cc
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 96ddd10d35de897bb4fe27a4a33b05acb0c574da..a3adf2362873de9cb367b87434bd8aee87829342 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -889,9 +889,10 @@ int SSLClientSocketOpenSSL::Init() {
if (ssl_config_.require_ecdhe)
command.append(":!kRSA:!kDHE");
- if (!ssl_config_.enable_deprecated_cipher_suites) {
+ if (!ssl_config_.rc4_enabled)
command.append(":!RC4");
- } else {
+
+ if (ssl_config_.deprecated_cipher_suites_enabled) {
// Add TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 under a fallback. This is
// believed to work around a bug in some out-of-date Microsoft IIS servers
// which cause them to require the version downgrade
@@ -2051,7 +2052,7 @@ std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const {
}
result.append("/");
- if (ssl_config_.enable_deprecated_cipher_suites)
+ if (ssl_config_.deprecated_cipher_suites_enabled)
result.append("deprecated");
result.append("/");

Powered by Google App Engine
This is Rietveld 408576698