summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-28 15:08:19 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-28 15:08:19 +0000
commite004c4075d0f4939224e622e252e0a62c52183e1 (patch)
tree77508e1166c18580ddf673d351fa57144b65fae4 /net
parenta4f4ab3fda8ef20ec14a66dff910fe40c0842e04 (diff)
downloadchromium_src-e004c4075d0f4939224e622e252e0a62c52183e1.zip
chromium_src-e004c4075d0f4939224e622e252e0a62c52183e1.tar.gz
chromium_src-e004c4075d0f4939224e622e252e0a62c52183e1.tar.bz2
net: add (*.)pixi.me to HSTS preloaded.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-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 23ecd98..ecafe47 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -1178,6 +1178,7 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{27, true, "\006luneta\016nearbuysystems\003com", true, kNoPins,
DOMAIN_NOT_PINNED },
{12, true, "\006ubertt\003org", true, kNoPins, DOMAIN_NOT_PINNED },
+ {9, true, "\004pixi\002me", true, kNoPins, DOMAIN_NOT_PINNED },
// Twitter pins disabled in order to track down pinning failures --agl
{13, false, "\007twitter\003com", kTwitterHSTS,
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 5df4d0b..c2e3e9e 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -580,6 +580,9 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(ShouldRedirect("ubertt.org"));
EXPECT_TRUE(ShouldRedirect("foo.ubertt.org"));
+ EXPECT_TRUE(ShouldRedirect("pixi.me"));
+ EXPECT_TRUE(ShouldRedirect("www.pixi.me"));
+
#if defined(OS_CHROMEOS)
static const bool kTwitterHSTS = true;
#else