summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 15:13:48 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 15:13:48 +0000
commit62c9952085e7c4a1e4db28444b170c36514021f7 (patch)
tree6652e476b681279c95abcd16137b61e61a8780a0 /net/http
parent9da3e45a10115c7593b53ed27069387209f9fe28 (diff)
downloadchromium_src-62c9952085e7c4a1e4db28444b170c36514021f7.zip
chromium_src-62c9952085e7c4a1e4db28444b170c36514021f7.tar.gz
chromium_src-62c9952085e7c4a1e4db28444b170c36514021f7.tar.bz2
net: add (*.)conformal.com, (*.)cyphertite.com to HSTS preloaded.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/transport_security_state_static.h2
-rw-r--r--net/http/transport_security_state_static.json2
2 files changed, 4 insertions, 0 deletions
diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h
index 4d27046..a90b5c8 100644
--- a/net/http/transport_security_state_static.h
+++ b/net/http/transport_security_state_static.h
@@ -815,6 +815,8 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{21, false, "\010pastebin\006linode\003com", true, kNoPins, DOMAIN_NOT_PINNED },
{21, true, "\017inertianetworks\003com", true, kNoPins, DOMAIN_NOT_PINNED },
{14, false, "\010carezone\003com", true, kNoPins, DOMAIN_NOT_PINNED },
+ {15, true, "\011conformal\003com", true, kNoPins, DOMAIN_NOT_PINNED },
+ {16, true, "\012cyphertite\003com", true, kNoPins, DOMAIN_NOT_PINNED },
};
static const size_t kNumPreloadedSTS = ARRAYSIZE_UNSAFE(kPreloadedSTS);
diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json
index f9b733f..91d1948 100644
--- a/net/http/transport_security_state_static.json
+++ b/net/http/transport_security_state_static.json
@@ -605,6 +605,8 @@
{ "name": "pastebin.linode.com", "mode": "force-https" },
{ "name": "inertianetworks.com", "include_subdomains": true, "mode": "force-https" },
{ "name": "carezone.com", "mode": "force-https" },
+ { "name": "conformal.com", "include_subdomains": true, "mode": "force-https" },
+ { "name": "cyphertite.com", "include_subdomains": true, "mode": "force-https" },
// Entries that are only valid if the client supports SNI.
{ "name": "gmail.com", "mode": "force-https", "pins": "google", "snionly": true },