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

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

Issue 88913003: Revert: "net: don't allow SSLv3 fallback for Google properties." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/net/ssl_config_service_manager_pref_unittest.cc » ('j') | 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 std::string version_min_str = 237 std::string version_min_str =
238 SSLProtocolVersionToString(default_config.version_min); 238 SSLProtocolVersionToString(default_config.version_min);
239 std::string version_max_str = 239 std::string version_max_str =
240 SSLProtocolVersionToString(default_config.version_max); 240 SSLProtocolVersionToString(default_config.version_max);
241 registry->RegisterStringPref(prefs::kSSLVersionMin, version_min_str); 241 registry->RegisterStringPref(prefs::kSSLVersionMin, version_min_str);
242 registry->RegisterStringPref(prefs::kSSLVersionMax, version_max_str); 242 registry->RegisterStringPref(prefs::kSSLVersionMax, version_max_str);
243 registry->RegisterBooleanPref(prefs::kEnableOriginBoundCerts, 243 registry->RegisterBooleanPref(prefs::kEnableOriginBoundCerts,
244 default_config.channel_id_enabled); 244 default_config.channel_id_enabled);
245 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, 245 registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting,
246 !default_config.false_start_enabled); 246 !default_config.false_start_enabled);
247 // Note: until http://crbug/237055 is resolved, unrestricted SSL 3.0 fallback
248 // is always enabled.
247 registry->RegisterBooleanPref(prefs::kEnableUnrestrictedSSL3Fallback, 249 registry->RegisterBooleanPref(prefs::kEnableUnrestrictedSSL3Fallback,
248 default_config.unrestricted_ssl3_fallback_enabled); 250 true /* default_config.unrestricted_ssl3_fallback_enabled */);
249 registry->RegisterListPref(prefs::kCipherSuiteBlacklist); 251 registry->RegisterListPref(prefs::kCipherSuiteBlacklist);
250 } 252 }
251 253
252 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { 254 net::SSLConfigService* SSLConfigServiceManagerPref::Get() {
253 return ssl_config_service_.get(); 255 return ssl_config_service_.get();
254 } 256 }
255 257
256 void SSLConfigServiceManagerPref::OnPreferenceChanged( 258 void SSLConfigServiceManagerPref::OnPreferenceChanged(
257 PrefService* prefs, 259 PrefService* prefs,
258 const std::string& pref_name_in) { 260 const std::string& pref_name_in) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 // static 323 // static
322 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( 324 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
323 PrefService* local_state) { 325 PrefService* local_state) {
324 return new SSLConfigServiceManagerPref(local_state); 326 return new SSLConfigServiceManagerPref(local_state);
325 } 327 }
326 328
327 // static 329 // static
328 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { 330 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) {
329 SSLConfigServiceManagerPref::RegisterPrefs(registry); 331 SSLConfigServiceManagerPref::RegisterPrefs(registry);
330 } 332 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/ssl_config_service_manager_pref_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698