summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 13:57:30 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 13:57:30 +0000
commit85bb5690d26787f6c4eddad1fd449a5eb23a0c49 (patch)
tree609075fcaee0e7e89295c434ce4a4e4c1384f5ff /net
parentfc2fc50953eff235c11922d0a940424a4748531c (diff)
downloadchromium_src-85bb5690d26787f6c4eddad1fd449a5eb23a0c49.zip
chromium_src-85bb5690d26787f6c4eddad1fd449a5eb23a0c49.tar.gz
chromium_src-85bb5690d26787f6c4eddad1fd449a5eb23a0c49.tar.bz2
net: another HSTS preloaded update
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/transport_security_state.cc4
-rw-r--r--net/base/transport_security_state_unittest.cc19
2 files changed, 23 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index adeaa8a..edda1b8 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -685,6 +685,10 @@ bool TransportSecurityState::IsPreloadedSTS(
{22, true, "\005check\012torproject\003org", true, kTorAcceptableCerts },
{20, true, "\003www\012torproject\003org", true, kTorAcceptableCerts },
{22, true, "\003www\014moneybookers\003com", true, 0 },
+ {17, false, "\013ledgerscope\003net", true, 0 },
+ {21, false, "\003www\013ledgerscope\003net", true, 0 },
+ {10, false, "\004kyps\003net", true, 0 },
+ {14, false, "\003www\004kyps\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 769300a..d84f469 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -693,6 +693,25 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
"moneybookers.com",
false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "ledgerscope.net",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "www.ledgerscope.net",
+ false));
+ EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
+ "status.ledgerscope.net",
+ false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "kyps.net",
+ false));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "www.kyps.net",
+ false));
+ EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
+ "foo.kyps.net",
+ false));
}
TEST_F(TransportSecurityStateTest, LongNames) {