summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 21:49:06 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 21:49:06 +0000
commit66b0ec0e4c0a9489e40987d013893f44feb40902 (patch)
treed1e058e3a4628392d69253e3e696fe939410ed51 /net
parent70df864412c41dbc3fb347a3bcfe07e2df47d526 (diff)
downloadchromium_src-66b0ec0e4c0a9489e40987d013893f44feb40902.zip
chromium_src-66b0ec0e4c0a9489e40987d013893f44feb40902.tar.gz
chromium_src-66b0ec0e4c0a9489e40987d013893f44feb40902.tar.bz2
net: add two Google backup pins.
(Details will be distributed internally to reviewers.) BUG=171444 Review URL: https://codereview.chromium.org/12045026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/transport_security_state_static.certs6
-rw-r--r--net/base/transport_security_state_static.h10
-rw-r--r--net/base/transport_security_state_static.json2
3 files changed, 18 insertions, 0 deletions
diff --git a/net/base/transport_security_state_static.certs b/net/base/transport_security_state_static.certs
index 346b48f..ea717b2 100644
--- a/net/base/transport_security_state_static.certs
+++ b/net/base/transport_security_state_static.certs
@@ -76,6 +76,12 @@ UUIuOss4jHg7y/j7lYe8vJD5UDI=
Google2048
sha1/AbkhxY0L343gKf+cki7NVWp+ozk=
+GoogleBackup1024
+sha1/fVujyo43ZR18ccPjt3TN6XsbWUM=
+
+GoogleBackup2048
+sha1/vq7OyjSnqOco9nyMCDGdy77eijM=
+
EquifaxSecureCA
-----BEGIN CERTIFICATE-----
MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
diff --git a/net/base/transport_security_state_static.h b/net/base/transport_security_state_static.h
index c47313b..0c98fb0 100644
--- a/net/base/transport_security_state_static.h
+++ b/net/base/transport_security_state_static.h
@@ -30,6 +30,14 @@ static const char kSPKIHash_Google2048[] =
"\x01\xb9\x21\xc5\x8d\x0b\xdf\x8d\xe0\x29"
"\xff\x9c\x92\x2e\xcd\x55\x6a\x7e\xa3\x39";
+static const char kSPKIHash_GoogleBackup1024[] =
+ "\x7d\x5b\xa3\xca\x8e\x37\x65\x1d\x7c\x71"
+ "\xc3\xe3\xb7\x74\xcd\xe9\x7b\x1b\x59\x43";
+
+static const char kSPKIHash_GoogleBackup2048[] =
+ "\xbe\xae\xce\xca\x34\xa7\xa8\xe7\x28\xf6"
+ "\x7c\x8c\x08\x31\x9d\xcb\xbe\xde\x8a\x33";
+
static const char kSPKIHash_EquifaxSecureCA[] =
"\x48\xe6\x68\xf9\x2b\xd2\xb2\x95\xd7\x47"
"\xd8\x23\x20\x10\x4f\x33\x98\x90\x9f\xd4";
@@ -240,6 +248,8 @@ static const char* const kGoogleAcceptableCerts[] = {
kSPKIHash_VeriSignClass3_G3,
kSPKIHash_Google1024,
kSPKIHash_Google2048,
+ kSPKIHash_GoogleBackup1024,
+ kSPKIHash_GoogleBackup2048,
kSPKIHash_EquifaxSecureCA,
kSPKIHash_GeoTrustGlobal,
NULL,
diff --git a/net/base/transport_security_state_static.json b/net/base/transport_security_state_static.json
index d70bed0..22bc1e7 100644
--- a/net/base/transport_security_state_static.json
+++ b/net/base/transport_security_state_static.json
@@ -46,6 +46,8 @@
"VeriSignClass3_G3",
"Google1024",
"Google2048",
+ "GoogleBackup1024",
+ "GoogleBackup2048",
"EquifaxSecureCA",
"GeoTrustGlobal"
],