summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 14:12:17 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 14:12:17 +0000
commit2115d282f01c592807e45400a5218158837f27d1 (patch)
treeb92939d04a54ba68a42b58c5bb272ad74a1b9986 /net
parent53ac50520952149c1cd8d9a2464104d59793f2f8 (diff)
downloadchromium_src-2115d282f01c592807e45400a5218158837f27d1.zip
chromium_src-2115d282f01c592807e45400a5218158837f27d1.tar.gz
chromium_src-2115d282f01c592807e45400a5218158837f27d1.tar.bz2
net: add crypto.is and simon.butcher.name to HSTS preloaded list.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94091 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 5dd3bc3..86fb839 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -646,6 +646,8 @@ bool TransportSecurityState::IsPreloadedSTS(
{13, true, "\010uprotect\002it", true, 0 },
{14, false, "\010squareup\003com", true, 0 },
{9, true, "\004cert\002se", true, 0 },
+ {11, true, "\006crypto\002is", true, 0 },
+ {20, true, "\005simon\007butcher\004name", 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 50740bd..1833791 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -621,6 +621,20 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
"foo.cert.se",
false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "crypto.is",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "foo.crypto.is",
+ false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "simon.butcher.name",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "foo.simon.butcher.name",
+ false));
}
TEST_F(TransportSecurityStateTest, LongNames) {