summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-12 15:25:13 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-12 15:25:13 +0000
commit8c77b83c8d278b601736f6c5db9eddb7ca135bb3 (patch)
tree3001328c30523b998197248ed9ae70fcc3fc3e49
parent789783acd9244a0c6f7a5ee32cdd272ba0a0e518 (diff)
downloadchromium_src-8c77b83c8d278b601736f6c5db9eddb7ca135bb3.zip
chromium_src-8c77b83c8d278b601736f6c5db9eddb7ca135bb3.tar.gz
chromium_src-8c77b83c8d278b601736f6c5db9eddb7ca135bb3.tar.bz2
net: add a couple of entries to the HSTS preloaded list.
This change also alters some previous entries that were added manually. Review URL: https://codereview.chromium.org/11369156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167178 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/transport_security_state.cc2
-rw-r--r--net/base/transport_security_state_static.h8
-rw-r--r--net/base/transport_security_state_static.json2
3 files changed, 9 insertions, 3 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 5cb4312..e943e50 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -849,6 +849,8 @@ enum SecondLevelDomainName {
DOMAIN_GOOGLE_VU,
DOMAIN_GOOGLE_WS,
+ DOMAIN_CHROMIUM_ORG,
+
// Boundary value for UMA_HISTOGRAM_ENUMERATION:
DOMAIN_NUM_EVENTS
};
diff --git a/net/base/transport_security_state_static.h b/net/base/transport_security_state_static.h
index e10a13c..6a72549 100644
--- a/net/base/transport_security_state_static.h
+++ b/net/base/transport_security_state_static.h
@@ -326,15 +326,15 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{17, true, "\004apis\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM },
{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_APPSPOT_COM },
+ {25, true, "\012codereview\010chromium\003org", true, kGooglePins, DOMAIN_CHROMIUM_ORG },
+ {17, false, "\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 },
{23, true, "\021googleusercontent\003com", false, kGooglePins, DOMAIN_GOOGLEUSERCONTENT_COM },
{13, true, "\007youtube\003com", false, kGooglePins, DOMAIN_YOUTUBE_COM },
{16, true, "\012googleapis\003com", false, kGooglePins, DOMAIN_GOOGLEAPIS_COM },
{22, true, "\020googleadservices\003com", false, kGooglePins, DOMAIN_GOOGLEADSERVICES_COM },
- {16, true, "\012googlecode\003com", false, kGooglePins, DOMAIN_GOOGLECODE_COM },
- {17, false, "\004code\006google\003com", true, kGooglePins, DOMAIN_GOOGLECODE_COM },
{13, true, "\007appspot\003com", false, kGooglePins, DOMAIN_APPSPOT_COM },
{23, true, "\021googlesyndication\003com", false, kGooglePins, DOMAIN_GOOGLESYNDICATION_COM },
{17, true, "\013doubleclick\003net", false, kGooglePins, DOMAIN_DOUBLECLICK_NET },
@@ -682,6 +682,8 @@ static const struct HSTSPreload kPreloadedSTS[] = {
{15, true, "\012stocktrade\002de", true, kNoPins, DOMAIN_NOT_PINNED },
{13, true, "\007rhcloud\003com", true, kNoPins, DOMAIN_NOT_PINNED },
{22, true, "\011openshift\006redhat\003com", true, kNoPins, DOMAIN_NOT_PINNED },
+ {18, true, "\014therapynotes\003com", true, kNoPins, DOMAIN_NOT_PINNED },
+ {9, true, "\003wiz\003biz", true, kNoPins, DOMAIN_NOT_PINNED },
};
static const size_t kNumPreloadedSTS = ARRAYSIZE_UNSAFE(kPreloadedSTS);
diff --git a/net/base/transport_security_state_static.json b/net/base/transport_security_state_static.json
index df52921..2e44bcb 100644
--- a/net/base/transport_security_state_static.json
+++ b/net/base/transport_security_state_static.json
@@ -545,6 +545,8 @@
{ "name": "stocktrade.de", "include_subdomains": true, "mode": "force-https" },
{ "name": "rhcloud.com", "include_subdomains": true, "mode": "force-https" },
{ "name": "openshift.redhat.com", "include_subdomains": true, "mode": "force-https" },
+ { "name": "therapynotes.com", "include_subdomains": true, "mode": "force-https" },
+ { "name": "wiz.biz", "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 },