summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-22 14:53:22 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-22 14:53:22 +0000
commit5eda174b622158b17157d2d53ad6cfefec160203 (patch)
treea5d5852e8aa8b9bedae3583a580d5dd2156eeb7b /net
parent5ef189ef9be735246b860933573c4b86ade4fb38 (diff)
downloadchromium_src-5eda174b622158b17157d2d53ad6cfefec160203.zip
chromium_src-5eda174b622158b17157d2d53ad6cfefec160203.tar.gz
chromium_src-5eda174b622158b17157d2d53ad6cfefec160203.tar.bz2
net: Add aladdinschools.appspot.com to HSTS preloaded list.
Requested by: Kenneth Macleod BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75590 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.cc2
2 files changed, 3 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index d2ec579..afa3083 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -467,6 +467,7 @@ bool TransportSecurityState::IsPreloadedSTS(
{19, true, "\006health\006google\003com"},
{21, true, "\010checkout\006google\003com"},
{19, true, "\006chrome\006google\003com"},
+ {28, false, "\016aladdinschools\007appspot\003com"},
};
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 3eabc06..f03734a 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -392,6 +392,8 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "chrome.google.com"));
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "checkout.google.com"));
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "health.google.com"));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "aladdinschools.appspot.com"));
}
TEST_F(TransportSecurityStateTest, LongNames) {