Added client-side support for the TLS cached info extension. This feature is disabled by default ...

net/base/ssl_config_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/ssl_config_service.h"
 
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/ssl_false_start_blacklist.h"
 
 namespace net {
 
 SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {}
 
 SSLConfig::CertAndStatus::~CertAndStatus() {}
 
 SSLConfig::SSLConfig()
     : rev_checking_enabled(true), ssl3_enabled(true),
       tls1_enabled(true),
-      dns_cert_provenance_checking_enabled(false),
+      dns_cert_provenance_checking_enabled(false), cached_info_enabled(false),
       false_start_enabled(true),
       send_client_cert(false), verify_ev_cert(false), ssl3_fallback(false) {
 }
 
 SSLConfig::~SSLConfig() {
 }
 
 bool SSLConfig::IsAllowedBadCert(X509Certificate* cert,
                                  int* cert_status) const {
   for (size_t i = 0; i < allowed_bad_certs.size(); ++i) {
@@ skipping 12 matching lines @@
 
 // static
 bool SSLConfigService::IsKnownFalseStartIncompatibleServer(
     const std::string& hostname) {
   return SSLFalseStartBlacklist::IsMember(hostname.c_str());
 }
 
 static bool g_false_start_enabled = true;
 static bool g_dns_cert_provenance_checking = false;
 static bool g_rev_checking_disabled_for_pinned_sites = false;
+static bool g_cached_info_enabled = false;
 
 // static
 void SSLConfigService::DisableFalseStart() {
   g_false_start_enabled = false;
 }
 
 // static
 bool SSLConfigService::false_start_enabled() {
   return g_false_start_enabled;
 }
 
 // static
 void SSLConfigService::EnableDNSCertProvenanceChecking() {
   g_dns_cert_provenance_checking = true;
 }
 
 // static
+void SSLConfigService::EnableCachedInfo() {
+  g_cached_info_enabled = true;
+}
+
+// static
+bool SSLConfigService::cached_info_enabled() {
+  return g_cached_info_enabled;
+}

[wtc, 2011/06/17 22:57:09]

Move this up to before line 53.  The Style guide recommends:
  Method definitions in the corresponding .cc file should be
  the same as the declaration order, as much as possible.

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Declaration_Order

[rkn, 2011/06/20 21:21:09]

Done.

+
+// static
 bool SSLConfigService::dns_cert_provenance_checking_enabled() {
   return g_dns_cert_provenance_checking;
 }
 
 // static
 void SSLConfigService::DisableRevCheckingForPinnedSites() {
   g_rev_checking_disabled_for_pinned_sites = true;
 }
 
 // static
@@ skipping 10 matching lines @@
 }
 
 SSLConfigService::~SSLConfigService() {
 }
 
 // static
 void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
   ssl_config->false_start_enabled = g_false_start_enabled;
   ssl_config->dns_cert_provenance_checking_enabled =
       g_dns_cert_provenance_checking;
+  ssl_config->cached_info_enabled = g_cached_info_enabled;
 }
 
 void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config,
                                            const SSLConfig& new_config) {
   if (orig_config.rev_checking_enabled != new_config.rev_checking_enabled ||
       orig_config.ssl3_enabled != new_config.ssl3_enabled ||
       orig_config.tls1_enabled != new_config.tls1_enabled) {
     FOR_EACH_OBSERVER(Observer, observer_list_, OnSSLConfigChanged());
   }
 }
 
 // static
 bool SSLConfigService::IsSNIAvailable(SSLConfigService* service) {
   if (!service)
     return false;
 
   SSLConfig ssl_config;
   service->GetSSLConfig(&ssl_config);
   return ssl_config.tls1_enabled;
 }
 
 }  // namespace net