summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-08 19:06:29 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-08 19:06:29 +0000
commit0cb6cf7219217ebe982e5b8d222229ca0ae09252 (patch)
tree2fa1c66e8722f69eb5b3d498ae18334ce27e5e6f /net/base
parent62c76b55b4f5b13e7ed5820ba1af465d085ddcd7 (diff)
downloadchromium_src-0cb6cf7219217ebe982e5b8d222229ca0ae09252.zip
chromium_src-0cb6cf7219217ebe982e5b8d222229ca0ae09252.tar.gz
chromium_src-0cb6cf7219217ebe982e5b8d222229ca0ae09252.tar.bz2
Complete HSTS preload for *.code.google.com.
BUG=158594 Review URL: https://codereview.chromium.org/11794040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/transport_security_state_static.h2
-rw-r--r--net/base/transport_security_state_static.json5
2 files changed, 2 insertions, 5 deletions
diff --git a/net/base/transport_security_state_static.h b/net/base/transport_security_state_static.h
index 2d05e9d..48710e5 100644
--- a/net/base/transport_security_state_static.h
+++ b/net/base/transport_security_state_static.h
@@ -341,7 +341,7 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{32, true, "\022chromiumcodereview\007appspot\003com", true, kGooglePins, DOMAIN_APPSPOT_COM },
{24, true, "\012codereview\007appspot\003com", true, kGooglePins, DOMAIN_APPSPOT_COM },
{25, true, "\012codereview\010chromium\003org", true, kGooglePins, DOMAIN_CHROMIUM_ORG },
- {17, false, "\004code\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
+ {17, true, "\004code\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{16, true, "\012googlecode\003com", false, kGooglePins, DOMAIN_GOOGLECODE_COM },
{23, true, "\005chart\004apis\006google\003com", false, kGooglePins, DOMAIN_GOOGLE_COM },
{11, true, "\005ytimg\003com", false, kGooglePins, DOMAIN_YTIMG_COM },
diff --git a/net/base/transport_security_state_static.json b/net/base/transport_security_state_static.json
index f0a704c..c3e897d 100644
--- a/net/base/transport_security_state_static.json
+++ b/net/base/transport_security_state_static.json
@@ -184,10 +184,7 @@
{ "name": "chromiumcodereview.appspot.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "codereview.appspot.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "codereview.chromium.org", "include_subdomains": true, "mode": "force-https", "pins": "google" },
- // TODO(palmer): include_subdomains must be set to true when the
- // certificate for uploads.code.google.com is corrected. See
- // https://code.google.com/p/chromium/issues/detail?id=158594.
- { "name": "code.google.com", "include_subdomains": false, "mode": "force-https", "pins": "google" },
+ { "name": "code.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "googlecode.com", "include_subdomains": true, "pins": "google" },
// chart.apis.google.com is *not* HSTS because the certificate doesn't match