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

Side by Side Diff: chrome/browser/net/ssl_config_service_manager_pref.cc

Issue 1111043002: Remove Finch flag for enabling SSL3. It's dead, Jim. (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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/net/ssl_config_service_manager.h" 4 #include "chrome/browser/net/ssl_config_service_manager.h"
5 5
6 #include <algorithm> 6 #include <algorithm>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 } 220 }
221 221
222 // static 222 // static
223 void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) { 223 void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) {
224 net::SSLConfig default_config; 224 net::SSLConfig default_config;
225 registry->RegisterBooleanPref(prefs::kCertRevocationCheckingEnabled, 225 registry->RegisterBooleanPref(prefs::kCertRevocationCheckingEnabled,
226 default_config.rev_checking_enabled); 226 default_config.rev_checking_enabled);
227 registry->RegisterBooleanPref( 227 registry->RegisterBooleanPref(
228 prefs::kCertRevocationCheckingRequiredLocalAnchors, 228 prefs::kCertRevocationCheckingRequiredLocalAnchors,
229 default_config.rev_checking_required_local_anchors); 229 default_config.rev_checking_required_local_anchors);
230 registry->RegisterStringPref(prefs::kSSLVersionMin, ""); 230 registry->RegisterStringPref(prefs::kSSLVersionMin, std::string());
eroman 2015/04/28 22:38:13 unrelated change?
Ryan Sleevi 2015/04/28 22:40:13 Yeah. My OCD couldn't resist (since we changed all
231 registry->RegisterStringPref(prefs::kSSLVersionMax, ""); 231 registry->RegisterStringPref(prefs::kSSLVersionMax, std::string());
232 registry->RegisterStringPref(prefs::kSSLVersionFallbackMin, ""); 232 registry->RegisterStringPref(prefs::kSSLVersionFallbackMin, std::string());
233 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, 233 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting,
234 !default_config.false_start_enabled); 234 !default_config.false_start_enabled);
235 registry->RegisterListPref(prefs::kCipherSuiteBlacklist); 235 registry->RegisterListPref(prefs::kCipherSuiteBlacklist);
236 } 236 }
237 237
238 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { 238 net::SSLConfigService* SSLConfigServiceManagerPref::Get() {
239 return ssl_config_service_.get(); 239 return ssl_config_service_.get();
240 } 240 }
241 241
242 void SSLConfigServiceManagerPref::OnPreferenceChanged( 242 void SSLConfigServiceManagerPref::OnPreferenceChanged(
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 std::string version_fallback_min_str = ssl_version_fallback_min_.GetValue(); 276 std::string version_fallback_min_str = ssl_version_fallback_min_.GetValue();
277 config->version_min = net::kDefaultSSLVersionMin; 277 config->version_min = net::kDefaultSSLVersionMin;
278 config->version_max = net::SSLClientSocket::GetMaxSupportedSSLVersion(); 278 config->version_max = net::SSLClientSocket::GetMaxSupportedSSLVersion();
279 config->version_fallback_min = net::kDefaultSSLVersionFallbackMin; 279 config->version_fallback_min = net::kDefaultSSLVersionFallbackMin;
280 uint16 version_min = SSLProtocolVersionFromString(version_min_str); 280 uint16 version_min = SSLProtocolVersionFromString(version_min_str);
281 uint16 version_max = SSLProtocolVersionFromString(version_max_str); 281 uint16 version_max = SSLProtocolVersionFromString(version_max_str);
282 uint16 version_fallback_min = 282 uint16 version_fallback_min =
283 SSLProtocolVersionFromString(version_fallback_min_str); 283 SSLProtocolVersionFromString(version_fallback_min_str);
284 if (version_min) { 284 if (version_min) {
285 config->version_min = version_min; 285 config->version_min = version_min;
286 } else {
287 const std::string group = base::FieldTrialList::FindFullName("SSLv3");
288 if (group == "Enabled") {
289 config->version_min = net::SSL_PROTOCOL_VERSION_SSL3;
290 }
291 } 286 }
292 if (version_max) { 287 if (version_max) {
293 uint16 supported_version_max = config->version_max; 288 uint16 supported_version_max = config->version_max;
294 config->version_max = std::min(supported_version_max, version_max); 289 config->version_max = std::min(supported_version_max, version_max);
295 } 290 }
296 if (version_fallback_min) { 291 if (version_fallback_min) {
297 config->version_fallback_min = version_fallback_min; 292 config->version_fallback_min = version_fallback_min;
298 } 293 }
299 config->disabled_cipher_suites = disabled_cipher_suites_; 294 config->disabled_cipher_suites = disabled_cipher_suites_;
300 // disabling False Start also happens to disable record splitting. 295 // disabling False Start also happens to disable record splitting.
(...skipping 19 matching lines...) Expand all
320 // static 315 // static
321 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( 316 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
322 PrefService* local_state) { 317 PrefService* local_state) {
323 return new SSLConfigServiceManagerPref(local_state); 318 return new SSLConfigServiceManagerPref(local_state);
324 } 319 }
325 320
326 // static 321 // static
327 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { 322 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) {
328 SSLConfigServiceManagerPref::RegisterPrefs(registry); 323 SSLConfigServiceManagerPref::RegisterPrefs(registry);
329 } 324 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698