summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 19:03:49 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 19:03:49 +0000
commit5609748e3df145f7b694b87e9946f5a64ed73bdb (patch)
tree8b67586a40bd9c7e81ef60b2498bc9bf26367ed8
parent5fbef995afe18587a4fde7677ddea2d331ff5775 (diff)
downloadchromium_src-5609748e3df145f7b694b87e9946f5a64ed73bdb.zip
chromium_src-5609748e3df145f7b694b87e9946f5a64ed73bdb.tar.gz
chromium_src-5609748e3df145f7b694b87e9946f5a64ed73bdb.tar.bz2
Merge 69729 - net: add factor.cc to HSTS preloaded list.
(Requested by Robin Buse.) BUG=none TEST=net_unittests TBR=agl@chromium.org Review URL: http://codereview.chromium.org/5961003 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@69733 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/transport_security_state.cc1
-rw-r--r--net/base/transport_security_state_unittest.cc3
2 files changed, 4 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 3014e21..69c915d 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -411,6 +411,7 @@ bool TransportSecurityState::IsPreloadedSTS(
{19, true, "\015sunshinepress\003org"},
{21, false, "\003www\013noisebridge\003net"},
{10, false, "\004neg9\003org"},
+ {11, false, "\006factor\002cc"},
};
static const size_t kNumPreloadedSTS = ARRAYSIZE_UNSAFE(kPreloadedSTS);
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 2a06501..47a3562 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -345,6 +345,9 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "neg9.org"));
EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "www.neg9.org"));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "factor.cc"));
+ EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "www.factor.cc"));
}
TEST_F(TransportSecurityStateTest, LongNames) {