summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-30 19:19:36 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-30 19:19:36 +0000
commit5287d0097910d46c72106db7462b17997efed877 (patch)
tree3c9520a00b626bbfd2975a39116c17e73914d3b2 /net
parent49eba7ae99dd133ed58f585bbdf7aba30c2cd8bb (diff)
downloadchromium_src-5287d0097910d46c72106db7462b17997efed877.zip
chromium_src-5287d0097910d46c72106db7462b17997efed877.tar.gz
chromium_src-5287d0097910d46c72106db7462b17997efed877.tar.bz2
net: add squareup.com and uprotect.it to HSTS preloaded list.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/transport_security_state.cc2
-rw-r--r--net/base/transport_security_state_unittest.cc14
2 files changed, 16 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index cd1520a..cd46b3a 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -640,6 +640,8 @@ bool TransportSecurityState::IsPreloadedSTS(
{15, true, "\005login\004sapo\002pt", true, 0 },
{19, true, "\015mattmccutchen\003net", true, 0 },
{11, true, "\006betnet\002fr", true, 0 },
+ {13, true, "\010uprotect\002it", true, 0 },
+ {14, false, "\010squareup\003com", 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 e000b4f..8c79fdd 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -603,6 +603,20 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
"foo.betnet.fr",
false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "uprotect.it",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "foo.uprotect.it",
+ false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "squareup.com",
+ false));
+ EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
+ "foo.squareup.com",
+ false));
}
TEST_F(TransportSecurityStateTest, LongNames) {