No bug, Automated HPKP preload list update from host bld-linux64-spot-082 - a=hpkp-update
authorffxbld
Sat, 09 May 2015 03:32:24 -0700
changeset 238341 8d04cc085cf5451e5f26b49e532c065bcd34f00f
parent 238340 d451630af7267e34172851505f8245720bbd0aed
child 238342 4bcfdb087d2634ba86dcb5b5b6a1bc7ab1c1b7db
push id580
push userffxbld
push dateSat, 09 May 2015 10:32:31 +0000
treeherdermozilla-b2g37_v2_2@8d04cc085cf5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershpkp-update
milestone37.0
No bug, Automated HPKP preload list update from host bld-linux64-spot-082 - a=hpkp-update
security/manager/boot/src/StaticHPKPins.h
--- a/security/manager/boot/src/StaticHPKPins.h
+++ b/security/manager/boot/src/StaticHPKPins.h
@@ -504,19 +504,27 @@ static const char* kPinset_google_sha1_D
   kGoogleG2Fingerprint,
   kGoogleBackup2048Fingerprint,
 };
 static const StaticFingerprints kPinset_google_sha1 = {
   sizeof(kPinset_google_sha1_Data) / sizeof(const char*),
   kPinset_google_sha1_Data
 };
 
+static const char* kPinset_google_sha256_Data[] = {
+  kGeoTrust_Global_CAFingerprint,
+};
+static const StaticFingerprints kPinset_google_sha256 = {
+  sizeof(kPinset_google_sha256_Data) / sizeof(const char*),
+  kPinset_google_sha256_Data
+};
+
 static const StaticPinset kPinset_google = {
   &kPinset_google_sha1,
-  nullptr
+  &kPinset_google_sha256
 };
 
 static const char* kPinset_tor_sha1_Data[] = {
   kTor1Fingerprint,
   kTor2Fingerprint,
   kTor3Fingerprint,
 };
 static const StaticFingerprints kPinset_tor_sha1 = {
@@ -1004,16 +1012,17 @@ static const TransportSecurityPreload kP
   { "googleplex.com", true, false, false, -1, &kPinset_google_root_pems },
   { "googlesyndication.com", true, false, false, -1, &kPinset_google_root_pems },
   { "googletagmanager.com", true, false, false, -1, &kPinset_google_root_pems },
   { "googletagservices.com", true, false, false, -1, &kPinset_google_root_pems },
   { "googleusercontent.com", true, false, false, -1, &kPinset_google_root_pems },
   { "goto.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "groups.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "gstatic.com", true, false, false, -1, &kPinset_google_root_pems },
+  { "hangouts.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "history.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "hostedtalkgadget.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "inbox.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "include-subdomains.pinning.example.com", true, false, false, -1, &kPinset_mozilla_test },
   { "login.corp.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "m.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "mail.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "market.android.com", true, false, false, -1, &kPinset_google_root_pems },
@@ -1073,13 +1082,13 @@ static const TransportSecurityPreload kP
   { "www.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "xbrlsuccess.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "youtu.be", true, false, false, -1, &kPinset_google_root_pems },
   { "youtube-nocookie.com", true, false, false, -1, &kPinset_google_root_pems },
   { "youtube.com", true, false, false, -1, &kPinset_google_root_pems },
   { "ytimg.com", true, false, false, -1, &kPinset_google_root_pems },
 };
 
-// Pinning Preload List Length = 347;
+// Pinning Preload List Length = 348;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1439029295787000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1439634166654000);