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

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

Issue 1139013002: Completely remove SSLv3 support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 switch (ssl_config_for_origin.version_max) { 132 switch (ssl_config_for_origin.version_max) {
133 case SSL_PROTOCOL_VERSION_TLS1_2: 133 case SSL_PROTOCOL_VERSION_TLS1_2:
134 prefix = "ssl(max:3.3)/"; 134 prefix = "ssl(max:3.3)/";
135 break; 135 break;
136 case SSL_PROTOCOL_VERSION_TLS1_1: 136 case SSL_PROTOCOL_VERSION_TLS1_1:
137 prefix = "ssl(max:3.2)/"; 137 prefix = "ssl(max:3.2)/";
138 break; 138 break;
139 case SSL_PROTOCOL_VERSION_TLS1: 139 case SSL_PROTOCOL_VERSION_TLS1:
140 prefix = "ssl(max:3.1)/"; 140 prefix = "ssl(max:3.1)/";
141 break; 141 break;
142 case SSL_PROTOCOL_VERSION_SSL3:
143 prefix = "sslv3/";
144 break;
145 default: 142 default:
146 CHECK(false); 143 CHECK(false);
147 break; 144 break;
148 } 145 }
149 } 146 }
150 // Place sockets with and without deprecated ciphers into separate 147 // Place sockets with and without deprecated ciphers into separate
151 // connection groups. 148 // connection groups.
152 if (ssl_config_for_origin.enable_deprecated_cipher_suites) 149 if (ssl_config_for_origin.enable_deprecated_cipher_suites)
153 prefix += "deprecatedciphers/"; 150 prefix += "deprecatedciphers/";
154 connection_group = prefix + connection_group; 151 connection_group = prefix + connection_group;
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 return InitSocketPoolHelper( 498 return InitSocketPoolHelper(
502 group_type, endpoint, request_extra_headers, request_load_flags, 499 group_type, endpoint, request_extra_headers, request_load_flags,
503 request_priority, session, proxy_info, want_spdy_over_npn, 500 request_priority, session, proxy_info, want_spdy_over_npn,
504 ssl_config_for_origin, ssl_config_for_proxy, /*force_tunnel=*/false, 501 ssl_config_for_origin, ssl_config_for_proxy, /*force_tunnel=*/false,
505 privacy_mode, net_log, num_preconnect_streams, NULL, 502 privacy_mode, net_log, num_preconnect_streams, NULL,
506 HttpNetworkSession::NORMAL_SOCKET_POOL, OnHostResolutionCallback(), 503 HttpNetworkSession::NORMAL_SOCKET_POOL, OnHostResolutionCallback(),
507 CompletionCallback()); 504 CompletionCallback());
508 } 505 }
509 506
510 } // namespace net 507 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698