Read and Write SSL3, TLS1 and Cert revocation SSL preferences

net/base/ssl_config_service.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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"
 
-#if defined(OS_WIN)
-#include "net/base/ssl_config_service_win.h"
-#elif defined(OS_MACOSX)
-#include "net/base/ssl_config_service_mac.h"
-#else
-#include "net/base/ssl_config_service_defaults.h"
-#endif
-
 namespace net {
 
 SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {}
 
 SSLConfig::CertAndStatus::~CertAndStatus() {}
 
 SSLConfig::SSLConfig()
     : rev_checking_enabled(true), ssl3_enabled(true),
       tls1_enabled(true), dnssec_enabled(false), snap_start_enabled(false),
       dns_cert_provenance_checking_enabled(false),
@@ skipping 11 matching lines @@
   }
   return false;
 }
 
 SSLConfigService::SSLConfigService()
     : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
 }
 
 // static
 SSLConfigService* SSLConfigService::CreateSystemSSLConfigService() {
-#if defined(OS_WIN)
-  return new SSLConfigServiceWin;
-#elif defined(OS_MACOSX)
-  return new SSLConfigServiceMac;
-#else
+  // We don't use the system SSL configuration any more. We will be getting rid
+  // of CreateSystemSSLConfigService real soon and we will simplify the code
+  // further.

[wtc, 2011/04/06 00:33:28]

Please omit the second sentence, which promises "real soon",
unless someone really is going to do that.  You can change
that into a TODO comment, without "real soon".

Please discuss with mattm how this can be simplified.  It
seems that the indirection of SSLConfigServiceManager can
be eliminated...

If we don't have time to simplify the code, I guess we
can at least rename this method CreateSSLConfigServiceDefaults
to reflect the current implementation.  Note: it is
tempting to rename this method CreateDefaultSSLConfigService,
but I think it will be easily confused with
SSLConfigServiceManager::CreateDefaultManager.

[ramant (doing other things), 2011/04/06 01:30:03]

Done.

   return new SSLConfigServiceDefaults;
-#endif
 }
 
 // static
 bool SSLConfigService::IsKnownStrictTLSServer(const std::string& hostname) {
   // If you wish to add an entry to this list, please contact agl AT chromium
   // DOT org.
   //
   // If this list starts growing, it'll need to be something more efficient
   // than a linear list.
   static const char kStrictServers[][22] = {
@@ skipping 105 matching lines @@
 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());
   }
 }
 
 }  // namespace net