summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 22:38:11 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 22:38:11 +0000
commitb0c5fadbdfc29dc955c07423d3d4ea9f7f78c3b9 (patch)
treec33447ff08c1afc5320567f41e53244ae1e64408 /net
parent11cb1cb28a9595edbbca5f41520bedda359c1ee8 (diff)
downloadchromium_src-b0c5fadbdfc29dc955c07423d3d4ea9f7f78c3b9.zip
chromium_src-b0c5fadbdfc29dc955c07423d3d4ea9f7f78c3b9.tar.gz
chromium_src-b0c5fadbdfc29dc955c07423d3d4ea9f7f78c3b9.tar.bz2
net: add HSTS entry for (*.)riseup.net
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67775 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.cc3
2 files changed, 4 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 5cf85a1..14a9cd8 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -429,6 +429,7 @@ bool TransportSecurityState::IsPreloadedSTS(
{19, true, "\015sunshinepress\003org"},
{21, false, "\003www\013noisebridge\003net"},
{10, false, "\004neg9\003org"},
+ {12, true, "\006riseup\003net"},
};
static const size_t kNumPreloadedSTS = ARRAYSIZE_UNSAFE(kPreloadedSTS);
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 00ecef5..1ddd2e9 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -354,6 +354,9 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "neg9.org"));
EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "www.neg9.org"));
+
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "riseup.net"));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "foo.riseup.net"));
}
TEST_F(TransportSecurityStateTest, LongNames) {