summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 19:21:23 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 19:21:23 +0000
commitd43846e1246ece5440cf729dfe0324979c22dbc9 (patch)
tree2cc81ec73a486a6d438d85b4953621825d08c92b /net
parentdca84180e9ac4fc9b8b16be891188feae3cd1230 (diff)
downloadchromium_src-d43846e1246ece5440cf729dfe0324979c22dbc9.zip
chromium_src-d43846e1246ece5440cf729dfe0324979c22dbc9.tar.gz
chromium_src-d43846e1246ece5440cf729dfe0324979c22dbc9.tar.bz2
...
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100466 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.cc8
2 files changed, 9 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 8996d4e..adeaa8a 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -684,6 +684,7 @@ bool TransportSecurityState::IsPreloadedSTS(
{21, true, "\004blog\012torproject\003org", true, kTorAcceptableCerts },
{22, true, "\005check\012torproject\003org", true, kTorAcceptableCerts },
{20, true, "\003www\012torproject\003org", true, kTorAcceptableCerts },
+ {22, true, "\003www\014moneybookers\003com", 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 afea1ab..769300a 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -685,6 +685,14 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
"foo.torproject.org",
false));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "www.moneybookers.com",
+ false));
+ EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
+ "moneybookers.com",
+ false));
+
}
TEST_F(TransportSecurityStateTest, LongNames) {