summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 15:00:13 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 15:00:13 +0000
commitc6bf65190096bf85d921b7073825967811a35447 (patch)
tree90b0624996718e3d14281b5b8542ab5365efdd5f /net/base
parent081aa240933a868149dee8edbfb1e131fc3a7492 (diff)
downloadchromium_src-c6bf65190096bf85d921b7073825967811a35447.zip
chromium_src-c6bf65190096bf85d921b7073825967811a35447.tar.gz
chromium_src-c6bf65190096bf85d921b7073825967811a35447.tar.bz2
net: add cloudsecurityalliance.org to HSTS preloaded list.
Requested by Kurt Seifried. TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/transport_security_state.cc1
-rw-r--r--net/base/transport_security_state_unittest.cc7
2 files changed, 8 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 09407ff..ef3bc6e 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -632,6 +632,7 @@ bool TransportSecurityState::IsPreloadedSTS(
{16, false, "\012logentries\003com", true, 0 },
{20, false, "\003www\012logentries\003com", true, 0 },
{12, true, "\006stripe\003com", true, 0 },
+ {27, true, "\025cloudsecurityalliance\003org", true, 0 },
#if defined(OS_CHROMEOS)
{13, false, "\007twitter\003com", true, 0 },
{17, false, "\003www\007twitter\003com", true, 0 },
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index e63f4a2..70d64bd 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -564,6 +564,13 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "stripe.com", false));
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "foo.stripe.com", false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "cloudsecurityalliance.org",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "foo.cloudsecurityalliance.org",
+ false));
}
TEST_F(TransportSecurityStateTest, LongNames) {