summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 16:25:25 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 16:25:25 +0000
commitbbc70d873d6189beb8ed661e912c65cf75ad0e9a (patch)
treec69053d86bda8c29243fb0f7b396e7ef87d7d547 /net/base
parentb231a08c6a523506b972ed2ce834f8aabde3b577 (diff)
downloadchromium_src-bbc70d873d6189beb8ed661e912c65cf75ad0e9a.zip
chromium_src-bbc70d873d6189beb8ed661e912c65cf75ad0e9a.tar.gz
chromium_src-bbc70d873d6189beb8ed661e912c65cf75ad0e9a.tar.bz2
net: add (*.)linx.net to HSTS preloaded list.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96957 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 86fb839..e82734d 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -648,6 +648,7 @@ bool TransportSecurityState::IsPreloadedSTS(
{9, true, "\004cert\002se", true, 0 },
{11, true, "\006crypto\002is", true, 0 },
{20, true, "\005simon\007butcher\004name", true, 0 },
+ {10, true, "\004linx\003net", 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 1833791..de4e0c8 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -635,6 +635,13 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
"foo.simon.butcher.name",
false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "linx.net",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "foo.linx.net",
+ false));
}
TEST_F(TransportSecurityStateTest, LongNames) {