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

Unified Diff: net/socket/client_socket_pool_manager.cc

Issue 2099673003: Delete TLS version fallback code in net/http. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fallback-die-die-die-2
Patch Set: Oops, got my branches confused. Created 4 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 | « net/log/net_log_event_type_list.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_manager.cc
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index ce8a5a5bfc03481afbf2deeff3cd3bac25ac3e65..3b38b2bd3780a7339ea0feedd3a5d008b91138c4 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -116,32 +116,7 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
connection_group = "ftp/" + connection_group;
}
if (using_ssl) {
- // All connections in a group should use the same SSLConfig settings.
- // Encode version_max in the connection group's name, unless it's the
- // default version_max. (We want the common case to use the shortest
- // encoding). A version_max of TLS 1.1 is encoded as "ssl(max:3.2)/"
- // rather than "tlsv1.1/" because the actual protocol version, which
- // is selected by the server, may not be TLS 1.1. Do not encode
- // version_min in the connection group's name because version_min
- // should be the same for all connections, whereas version_max may
- // change for version fallbacks.
std::string prefix = "ssl/";
- if (ssl_config_for_origin.version_max != kDefaultSSLVersionMax) {
- switch (ssl_config_for_origin.version_max) {
- case SSL_PROTOCOL_VERSION_TLS1_2:
- prefix = "ssl(max:3.3)/";
- break;
- case SSL_PROTOCOL_VERSION_TLS1_1:
- prefix = "ssl(max:3.2)/";
- break;
- case SSL_PROTOCOL_VERSION_TLS1:
- prefix = "ssl(max:3.1)/";
- break;
- default:
- CHECK(false);
- break;
- }
- }
// Place sockets with and without deprecated ciphers into separate
// connection groups.
if (ssl_config_for_origin.deprecated_cipher_suites_enabled)
« no previous file with comments | « net/log/net_log_event_type_list.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698