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

Side by Side Diff: net/socket/client_socket_pool_manager.cc

Issue 1052743003: Move RC4 behind a fallback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/client_socket_pool_manager.h" 5 #include "net/socket/client_socket_pool_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 prefix = "ssl(max:3.1)/"; 142 prefix = "ssl(max:3.1)/";
143 break; 143 break;
144 case SSL_PROTOCOL_VERSION_SSL3: 144 case SSL_PROTOCOL_VERSION_SSL3:
145 prefix = "sslv3/"; 145 prefix = "sslv3/";
146 break; 146 break;
147 default: 147 default:
148 CHECK(false); 148 CHECK(false);
149 break; 149 break;
150 } 150 }
151 } 151 }
152 // Place sockets with and without deprecated ciphers into separate
153 // connection groups.
154 if (ssl_config_for_origin.enable_deprecated_cipher_suites)
155 prefix += "deprecated/";
davidben 2015/04/01 22:22:59 NOTE: This, like with the fallback, means that we'
agl 2015/04/03 21:06:17 "deprecated" is a rather generic name. I'm not sur
davidben 2015/04/03 21:10:00 Done. (Went with deprecatedciphers. weakciphers im
152 connection_group = prefix + connection_group; 156 connection_group = prefix + connection_group;
153 } 157 }
154 158
155 bool ignore_limits = (request_load_flags & LOAD_IGNORE_LIMITS) != 0; 159 bool ignore_limits = (request_load_flags & LOAD_IGNORE_LIMITS) != 0;
156 if (!proxy_info.is_direct()) { 160 if (!proxy_info.is_direct()) {
157 ProxyServer proxy_server = proxy_info.proxy_server(); 161 ProxyServer proxy_server = proxy_info.proxy_server();
158 proxy_host_port.reset(new HostPortPair(proxy_server.host_port_pair())); 162 proxy_host_port.reset(new HostPortPair(proxy_server.host_port_pair()));
159 scoped_refptr<TransportSocketParams> proxy_tcp_params( 163 scoped_refptr<TransportSocketParams> proxy_tcp_params(
160 new TransportSocketParams( 164 new TransportSocketParams(
161 *proxy_host_port, 165 *proxy_host_port,
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 int num_preconnect_streams) { 510 int num_preconnect_streams) {
507 return InitSocketPoolHelper( 511 return InitSocketPoolHelper(
508 request_url, request_extra_headers, request_load_flags, request_priority, 512 request_url, request_extra_headers, request_load_flags, request_priority,
509 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, 513 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
510 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log, 514 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log,
511 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, 515 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL,
512 OnHostResolutionCallback(), CompletionCallback()); 516 OnHostResolutionCallback(), CompletionCallback());
513 } 517 }
514 518
515 } // namespace net 519 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698