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

Side by Side Diff: net/base/ssl_config_service.cc

Issue 7587003: Revert 95910 - Revert 95907 - Clean up SSL false start blacklist code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « build/util/build_util.gyp ('k') | net/base/ssl_false_start_blacklist.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/base/ssl_config_service.h" 5 #include "net/base/ssl_config_service.h"
6 6
7 #include "net/base/ssl_config_service_defaults.h" 7 #include "net/base/ssl_config_service_defaults.h"
8 #include "net/base/ssl_false_start_blacklist.h" 8 #include "net/base/ssl_false_start_blacklist.h"
9 9
10 namespace net { 10 namespace net {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 return false; 45 return false;
46 } 46 }
47 47
48 SSLConfigService::SSLConfigService() 48 SSLConfigService::SSLConfigService()
49 : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) { 49 : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
50 } 50 }
51 51
52 // static 52 // static
53 bool SSLConfigService::IsKnownFalseStartIncompatibleServer( 53 bool SSLConfigService::IsKnownFalseStartIncompatibleServer(
54 const std::string& hostname) { 54 const std::string& hostname) {
55 return SSLFalseStartBlacklist::IsMember(hostname.c_str()); 55 return SSLFalseStartBlacklist::IsMember(hostname);
56 } 56 }
57 57
58 static bool g_cached_info_enabled = false; 58 static bool g_cached_info_enabled = false;
59 static bool g_origin_bound_certs_enabled = false; 59 static bool g_origin_bound_certs_enabled = false;
60 static bool g_false_start_enabled = true; 60 static bool g_false_start_enabled = true;
61 static bool g_dns_cert_provenance_checking = false; 61 static bool g_dns_cert_provenance_checking = false;
62 62
63 // static 63 // static
64 void SSLConfigService::DisableFalseStart() { 64 void SSLConfigService::DisableFalseStart() {
65 g_false_start_enabled = false; 65 g_false_start_enabled = false;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 bool SSLConfigService::IsSNIAvailable(SSLConfigService* service) { 141 bool SSLConfigService::IsSNIAvailable(SSLConfigService* service) {
142 if (!service) 142 if (!service)
143 return false; 143 return false;
144 144
145 SSLConfig ssl_config; 145 SSLConfig ssl_config;
146 service->GetSSLConfig(&ssl_config); 146 service->GetSSLConfig(&ssl_config);
147 return ssl_config.tls1_enabled; 147 return ssl_config.tls1_enabled;
148 } 148 }
149 149
150 } // namespace net 150 } // namespace net
OLDNEW
« no previous file with comments | « build/util/build_util.gyp ('k') | net/base/ssl_false_start_blacklist.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698