summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 01:20:39 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 01:20:39 +0000
commitf47633e5cfe2d4718a63144a782283a2496fa5f0 (patch)
treecea7f76bf7cdf7af466e60cd68a80fc35c33e69c /net
parent6d76a05a264c5243077029e6016785c39ffe42f6 (diff)
downloadchromium_src-f47633e5cfe2d4718a63144a782283a2496fa5f0.zip
chromium_src-f47633e5cfe2d4718a63144a782283a2496fa5f0.tar.gz
chromium_src-f47633e5cfe2d4718a63144a782283a2496fa5f0.tar.bz2
ChromeOS specific HSTS section (with permission from Sumit, Will, more).
Included some of Twitter, with permission from Twitter Security. Review URL: http://codereview.chromium.org/6862004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/transport_security_state.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 6118f35..43690d5 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -525,6 +525,14 @@ bool TransportSecurityState::IsPreloadedSTS(
{13, false, "\010entropia\002de"},
{17, false, "\003www\010entropia\002de"},
{21, true, "\010accounts\006google\003com"},
+#if defined(OS_CHROMEOS)
+ {17, true, "\004mail\006google\003com"},
+ {13, false, "\007twitter\003com"},
+ {17, false, "\003www\007twitter\003com"},
+ {17, false, "\003api\007twitter\003com"},
+ {17, false, "\003dev\007twitter\003com"},
+ {22, false, "\010business\007twitter\003com"},
+#endif
};
static const size_t kNumPreloadedSTS = ARRAYSIZE_UNSAFE(kPreloadedSTS);