summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 14:26:05 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 14:26:05 +0000
commite0a18fecfc7b344e33827f32ffcaddb371911768 (patch)
tree8ddecf43567319fca0eba4c5bb68036e34dacb77
parent9588d1c967b6ed6441e08b12f7d83fa870996915 (diff)
downloadchromium_src-e0a18fecfc7b344e33827f32ffcaddb371911768.zip
chromium_src-e0a18fecfc7b344e33827f32ffcaddb371911768.tar.gz
chromium_src-e0a18fecfc7b344e33827f32ffcaddb371911768.tar.bz2
net: another HSTS preloaded addition.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105074 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/transport_security_state.cc2
-rw-r--r--net/base/transport_security_state_unittest.cc7
2 files changed, 9 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index dccde8f..523f6a8 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -1151,6 +1151,8 @@ bool TransportSecurityState::IsPreloadedSTS(
{13, false, "\007greplin\003com", true, 0 },
{17, false, "\003www\007greplin\003com", true, 0 },
{27, true, "\006luneta\016nearbuysystems\003com", true, 0 },
+ {12, true, "\006ubertt\003org", true, 0 },
+
{13, false, "\007twitter\003com", kTwitterHSTS, kTwitterComAcceptableCerts },
{17, true, "\003www\007twitter\003com", kTwitterHSTS, kTwitterComAcceptableCerts },
{17, true, "\003api\007twitter\003com", kTwitterHSTS, kTwitterComAcceptableCerts },
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index d60e6f2..4135b8b 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -712,6 +712,13 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state.IsEnabledForHost(&domain_state,
"foo.luneta.nearbuysystems.com",
false));
+ EXPECT_TRUE(state.IsEnabledForHost(&domain_state,
+ "ubertt.org",
+ false));
+ EXPECT_TRUE(state.IsEnabledForHost(&domain_state,
+ "foo.ubertt.org",
+ false));
+
#if defined(OS_CHROMEOS)
EXPECT_TRUE(state.IsEnabledForHost(&domain_state,