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

Side by Side Diff: components/ssl_config/ssl_config_service_manager_pref.cc

Issue 2613533004: Only disable SHA-1 for local trust anchors if there's a PrefService (Closed)
Patch Set: Expand test Created 3 years, 11 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 | components/ssl_config/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 "components/ssl_config/ssl_config_service_manager.h" 4 #include "components/ssl_config/ssl_config_service_manager.h"
5 5
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 // static 233 // static
234 void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) { 234 void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) {
235 net::SSLConfig default_config; 235 net::SSLConfig default_config;
236 registry->RegisterBooleanPref( 236 registry->RegisterBooleanPref(
237 ssl_config::prefs::kCertRevocationCheckingEnabled, 237 ssl_config::prefs::kCertRevocationCheckingEnabled,
238 default_config.rev_checking_enabled); 238 default_config.rev_checking_enabled);
239 registry->RegisterBooleanPref( 239 registry->RegisterBooleanPref(
240 ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors, 240 ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors,
241 default_config.rev_checking_required_local_anchors); 241 default_config.rev_checking_required_local_anchors);
242 registry->RegisterBooleanPref(ssl_config::prefs::kCertEnableSha1LocalAnchors, 242 registry->RegisterBooleanPref(ssl_config::prefs::kCertEnableSha1LocalAnchors,
243 default_config.sha1_local_anchors_enabled); 243 false);
244 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMin, 244 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMin,
245 std::string()); 245 std::string());
246 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax, 246 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax,
247 std::string()); 247 std::string());
248 registry->RegisterListPref(ssl_config::prefs::kCipherSuiteBlacklist); 248 registry->RegisterListPref(ssl_config::prefs::kCipherSuiteBlacklist);
249 registry->RegisterBooleanPref(ssl_config::prefs::kDHEEnabled, 249 registry->RegisterBooleanPref(ssl_config::prefs::kDHEEnabled,
250 default_config.dhe_enabled); 250 default_config.dhe_enabled);
251 } 251 }
252 252
253 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { 253 net::SSLConfigService* SSLConfigServiceManagerPref::Get() {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 PrefService* local_state, 314 PrefService* local_state,
315 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) { 315 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) {
316 return new SSLConfigServiceManagerPref(local_state, io_task_runner); 316 return new SSLConfigServiceManagerPref(local_state, io_task_runner);
317 } 317 }
318 318
319 // static 319 // static
320 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { 320 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) {
321 SSLConfigServiceManagerPref::RegisterPrefs(registry); 321 SSLConfigServiceManagerPref::RegisterPrefs(registry);
322 } 322 }
323 } // namespace ssl_config 323 } // namespace ssl_config
OLDNEW
« no previous file with comments | « no previous file | components/ssl_config/ssl_config_service_manager_pref_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698