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

Unified Diff: net/http/http_network_transaction.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
« no previous file with comments | « components/ssl_config/ssl_config_service_manager_pref.cc ('k') | net/socket/client_socket_pool_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index e0c41002ee1fa8b78fdaed33b599b03ea928674e..8a8e7421e4bbd5d3e8f5390f3fd5f601c176b45d 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -1291,13 +1291,13 @@ int HttpNetworkTransaction::HandleSSLHandshakeError(int error) {
// reflect servers require a deprecated cipher rather than merely prefer
// it. This, however, has no security benefit until the ciphers are actually
// removed.
- if (!server_ssl_config_.enable_deprecated_cipher_suites &&
+ if (!server_ssl_config_.deprecated_cipher_suites_enabled &&
(error == ERR_SSL_VERSION_OR_CIPHER_MISMATCH ||
error == ERR_CONNECTION_CLOSED || error == ERR_CONNECTION_RESET)) {
net_log_.AddEvent(
NetLog::TYPE_SSL_CIPHER_FALLBACK,
base::Bind(&NetLogSSLCipherFallbackCallback, &request_->url, error));
- server_ssl_config_.enable_deprecated_cipher_suites = true;
+ server_ssl_config_.deprecated_cipher_suites_enabled = true;
ResetConnectionAndRequestForResend();
return OK;
}
@@ -1514,7 +1514,7 @@ void HttpNetworkTransaction::RecordSSLFallbackMetrics(int result) {
}
UMA_HISTOGRAM_BOOLEAN("Net.ConnectionUsedSSLDeprecatedCipherFallback2",
- server_ssl_config_.enable_deprecated_cipher_suites);
+ server_ssl_config_.deprecated_cipher_suites_enabled);
if (server_ssl_config_.version_fallback) {
// Record the error code which triggered the fallback and the state the
« no previous file with comments | « components/ssl_config/ssl_config_service_manager_pref.cc ('k') | net/socket/client_socket_pool_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698