Remove RC4 by default.

net/socket/ssl_client_socket_openssl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // OpenSSL binding for SSLClientSocket. The class layout and general principle
 // of operation is derived from SSLClientSocketNSS.
 
 #include "net/socket/ssl_client_socket_openssl.h"
 
 #include <errno.h>
@@ skipping 870 matching lines @@
 
   // See SSLConfig::disabled_cipher_suites for description of the suites
   // disabled by default. Note that SHA256 and SHA384 only select HMAC-SHA256
   // and HMAC-SHA384 cipher suites, not GCM cipher suites with SHA256 or SHA384
   // as the handshake hash.
   std::string command("DEFAULT:!SHA256:-SHA384:!AESGCM+AES256:!aPSK");
 
   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
     // (https://crbug.com/433406).
     command.append(":ECDHE-RSA-AES256-SHA384");
   }
 
   // Remove any disabled ciphers.
   for (uint16_t id : ssl_config_.disabled_cipher_suites) {
     const SSL_CIPHER* cipher = SSL_get_cipher_by_value(id);
@@ skipping 1142 matching lines @@
       result.append("tls1.1");
       break;
     case SSL_PROTOCOL_VERSION_TLS1_2:
       result.append("tls1.2");
       break;
     default:
       NOTREACHED();
   }
 
   result.append("/");
-  if (ssl_config_.enable_deprecated_cipher_suites)
+  if (ssl_config_.deprecated_cipher_suites_enabled)
     result.append("deprecated");
 
   result.append("/");
   if (ssl_config_.channel_id_enabled)
     result.append("channelid");
 
   return result;
 }
 
 bool SSLClientSocketOpenSSL::IsRenegotiationAllowed() const {
@@ skipping 91 matching lines @@
     OnHandshakeIOComplete(signature_result_);
     return;
   }
 
   // During a renegotiation, either Read or Write calls may be blocked on an
   // asynchronous private key operation.
   PumpReadWriteEvents();
 }
 
 }  // namespace net