summaryrefslogtreecommitdiffstats
path: root/net/base/ssl_config_service.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-07 18:42:30 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-07 18:42:30 +0000
commitac59335587a2ffcac557d6c840a7595abb109914 (patch)
tree486bf6249324248421972208db60204e1d60054d /net/base/ssl_config_service.cc
parent0e3ffa253cb1e424430669b76b30223e810c9a86 (diff)
downloadchromium_src-ac59335587a2ffcac557d6c840a7595abb109914.zip
chromium_src-ac59335587a2ffcac557d6c840a7595abb109914.tar.gz
chromium_src-ac59335587a2ffcac557d6c840a7595abb109914.tar.bz2
Revert "net: add prober results to False Start blacklist."
Broke ARM build. Need to figure out how to make gyp build the helper binary for the host target, not the build target. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_config_service.cc')
-rw-r--r--net/base/ssl_config_service.cc31
1 files changed, 29 insertions, 2 deletions
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
index 753f1c7..c310cd2 100644
--- a/net/base/ssl_config_service.cc
+++ b/net/base/ssl_config_service.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "net/base/ssl_config_service.h"
-#include "net/base/ssl_false_start_blacklist.h"
#if defined(OS_WIN)
#include "net/base/ssl_config_service_win.h"
@@ -59,7 +58,35 @@ bool SSLConfigService::IsKnownStrictTLSServer(const std::string& hostname) {
// static
bool SSLConfigService::IsKnownFalseStartIncompatibleServer(
const std::string& hostname) {
- return SSLFalseStartBlacklist::IsMember(hostname.c_str());
+ // If this list starts growing, it'll need to be something more efficient
+ // than a linear list.
+ static const char kFalseStartIncompatibleServers[][15] = {
+ "www.picnik.com",
+ };
+
+ static const char kFalseStartIncompatibleDomains[][11] = {
+ // Added at the request of A10.
+ "yodlee.com",
+ };
+
+ // Note that the hostname is normalised to lower-case by this point.
+ for (size_t i = 0; i < arraysize(kFalseStartIncompatibleServers); i++) {
+ if (strcmp(hostname.c_str(), kFalseStartIncompatibleServers[i]) == 0)
+ return true;
+ }
+
+ for (size_t i = 0; i < arraysize(kFalseStartIncompatibleDomains); i++) {
+ const char* domain = kFalseStartIncompatibleDomains[i];
+ const size_t len = strlen(domain);
+ if (hostname.size() >= len &&
+ memcmp(&hostname[hostname.size() - len], domain, len) == 0 &&
+ (hostname.size() == len ||
+ hostname[hostname.size() - len - 1] == '.')) {
+ return true;
+ }
+ }
+
+ return false;
}
static bool g_dnssec_enabled = false;