summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 19:15:33 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 19:15:33 +0000
commitd86d7e65d3aad6bb1b6e3d151cb48ce4b6f7b421 (patch)
tree09d4132814c4e91755a0f68fe3da9798fa5cd968 /net
parenta6f67b466f13d4a1c980e4d0e4c44b1d408257b3 (diff)
downloadchromium_src-d86d7e65d3aad6bb1b6e3d151cb48ce4b6f7b421.zip
chromium_src-d86d7e65d3aad6bb1b6e3d151cb48ce4b6f7b421.tar.gz
chromium_src-d86d7e65d3aad6bb1b6e3d151cb48ce4b6f7b421.tar.bz2
Include subdomains for AppEngine preloaded HSTS/pinning.
BUG=358571 R=agl@chromium.org Review URL: https://codereview.chromium.org/220593005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/transport_security_state_static.h2
-rw-r--r--net/http/transport_security_state_static.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h
index 661a6a8..d6d50d7 100644
--- a/net/http/transport_security_state_static.h
+++ b/net/http/transport_security_state_static.h
@@ -389,7 +389,7 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{17, true, "\004docs\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{18, true, "\005sites\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{25, true, "\014spreadsheets\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
- {22, false, "\011appengine\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
+ {22, true, "\011appengine\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{22, true, "\011encrypted\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{21, true, "\010accounts\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{21, true, "\010profiles\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json
index 2af203c..19eb80e 100644
--- a/net/http/transport_security_state_static.json
+++ b/net/http/transport_security_state_static.json
@@ -168,7 +168,7 @@
{ "name": "docs.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "sites.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "spreadsheets.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
- { "name": "appengine.google.com", "mode": "force-https", "pins": "google" },
+ { "name": "appengine.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "encrypted.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "accounts.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "profiles.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },