No bug, Automated HPKP preload list update from host bld-linux64-spot-593 - a=hpkp-update
authorffxbld
Sat, 26 Dec 2015 04:05:29 -0800
changeset 317708 7d079eb4449bdb0a105b5b3ef17b6d1e9f7a5f11
parent 317707 823213097371498e524bfca915dad084b8a2e133
child 317709 c39a71cf41460924d2988d2d63be2f5d267db82a
push id8746
push userananuti@gmail.com
push dateSun, 27 Dec 2015 23:03:33 +0000
reviewershpkp-update
milestone46.0a1
No bug, Automated HPKP preload list update from host bld-linux64-spot-593 - a=hpkp-update
security/manager/ssl/StaticHPKPins.h
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -108,17 +108,17 @@ static const char kEquifax_Secure_Global
   "pvH5v4oKndwID7SbHvw9GhwsMtwOE2pbAMlzFvKj3BE=";
 
 /* Equifax Secure eBusiness CA 1 */
 static const char kEquifax_Secure_eBusiness_CA_1Fingerprint[] =
   "JsGNxu6m9jL2drzrodjCtINS8pwtX82oeOCdy4Mt1uU=";
 
 /* FacebookBackup */
 static const char kFacebookBackupFingerprint[] =
-  "1ww8E0AYsR2oX5lndk2hwp2Uosk=";
+  "q4PO2G2cbkZhZ82+JgmRUyGMoAeozA+BSXVXQWB8XWQ=";
 
 /* GOOGLE_PIN_DigiCertECCSecureServerCA */
 static const char kGOOGLE_PIN_DigiCertECCSecureServerCAFingerprint[] =
   "PZXN3lRAy+8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=";
 
 /* GOOGLE_PIN_Entrust_SSL */
 static const char kGOOGLE_PIN_Entrust_SSLFingerprint[] =
   "nsxRNo6G40YPZsKV5JQt1TCA8nseQQr/LRqp1Oa8fnw=";
@@ -208,29 +208,29 @@ static const char kGo_Daddy_Class_2_CAFi
   "VjLZe/p3W/PJnd6lL8JVNBCGQBZynFLdZSTIqcO0SJ8=";
 
 /* Go Daddy Root Certificate Authority - G2 */
 static const char kGo_Daddy_Root_Certificate_Authority___G2Fingerprint[] =
   "Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=";
 
 /* GoogleBackup2048 */
 static const char kGoogleBackup2048Fingerprint[] =
-  "vq7OyjSnqOco9nyMCDGdy77eijM=";
+  "IPMbDAjLVSGntGO3WP53X/zilCVndez5YJ2+vJvhJsA=";
 
 /* Network Solutions Certificate Authority */
 static const char kNetwork_Solutions_Certificate_AuthorityFingerprint[] =
   "MtGA7THJNVieydu7ciEjuIO1/C3BD5/KOpXXfhv8tTQ=";
 
 /* SpiderOak2 */
 static const char kSpiderOak2Fingerprint[] =
-  "D0fS/hquA6QprluciyO1hlFUAxg=";
+  "7Y3UnxbffL8aFPXsOJBpGasgpDmngpIhAxGKdQRklQQ=";
 
 /* SpiderOak3 */
 static const char kSpiderOak3Fingerprint[] =
-  "l5JoIXv4lztZ+C6TJWgxZCHQzS4=";
+  "LkER54vOdlygpTsbYvlpMq1CE/lDAG1AP9xmdtwvV2A=";
 
 /* Starfield Class 2 CA */
 static const char kStarfield_Class_2_CAFingerprint[] =
   "FfFKxFycfaIz00eRZOgTf+Ne4POK6FgYPwhBDqgqxLQ=";
 
 /* Starfield Root Certificate Authority - G2 */
 static const char kStarfield_Root_Certificate_Authority___G2Fingerprint[] =
   "gI1os/q0iEpflxrOfRBVDXqVoWN3Tz7Dav/7IT++THQ=";
@@ -252,29 +252,29 @@ static const char kTC_TrustCenter_Class_
   "k5KuIUmSSt435kXbof9L3dzaKykbYJdmnSr6XHo3Jhk=";
 
 /* TestSPKI */
 static const char kTestSPKIFingerprint[] =
   "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
 /* Tor1 */
 static const char kTor1Fingerprint[] =
-  "juNxSTv9UANmpC9kF5GKpmWNx3Y=";
+  "bYz9JTDk89X3qu3fgswG+lBQso5vI0N1f0Rx4go4nLo=";
 
 /* Tor2 */
 static const char kTor2Fingerprint[] =
-  "lia43lPolzSPVIq34Dw57uYcLD8=";
+  "xXCxhTdn7uxXneJSbQCqoAvuW3ZtQl2pDVTf2sewS8w=";
 
 /* Tor3 */
 static const char kTor3Fingerprint[] =
-  "rzEyQIKOh77j87n5bjWUNguXF8Y=";
+  "CleC1qwUR8JPgH1nXvSe2VHxDe5/KfNs96EusbfSOfo=";
 
 /* Twitter1 */
 static const char kTwitter1Fingerprint[] =
-  "Vv7zwhR9TtOIN/29MFI4cgHld40=";
+  "vU9M48LzD/CF34wE5PPf4nBwRyosy06X21J0ap8yS5s=";
 
 /* UTN USERFirst Email Root CA */
 static const char kUTN_USERFirst_Email_Root_CAFingerprint[] =
   "Laj56jRU0hFGRko/nQKNxMf7tXscUsc8KwVyovWZotM=";
 
 /* UTN USERFirst Hardware Root CA */
 static const char kUTN_USERFirst_Hardware_Root_CAFingerprint[] =
   "TUDnr0MEoJ3of7+YliBMBVFB4/gJsv5zO7IxD9+YoWI=";
@@ -324,21 +324,21 @@ static const char kVerisign_Class_3_Publ
   "SVqWumuteCQHvVIaALrOZXuzVVVeS7f4FGxxu6V+es4=";
 
 /* XRamp Global CA Root */
 static const char kXRamp_Global_CA_RootFingerprint[] =
   "BRz5+pXkDpuD7a7aaWH2Fox4ecRmAXJHnN1RqwPOpis=";
 
 /* YahooBackup1 */
 static const char kYahooBackup1Fingerprint[] =
-  "uwnZN/atr9+khywDukPzmD9kFiY=";
+  "2fRAUXyxl4A1/XHrKNBmc8bTkzA7y4FB/GLJuNAzCqY=";
 
 /* YahooBackup2 */
 static const char kYahooBackup2Fingerprint[] =
-  "Ui85k1YWcCl0z/4IlMvrDmI5zEo=";
+  "dolnbtzEBnELx/9lOEQ22e6OZO/QNb6VSSX2XHA3E7A=";
 
 /* thawte Primary Root CA */
 static const char kthawte_Primary_Root_CAFingerprint[] =
   "HXXQgxueCIU5TTLHob/bPbwcKOKw6DkfsTWYHbxbqTY=";
 
 /* thawte Primary Root CA - G2 */
 static const char kthawte_Primary_Root_CA___G2Fingerprint[] =
   "Z9xPMvoQ59AaeaBzqgyeAhLsL/w9d54Kp/nA8OHCyJM=";
@@ -493,72 +493,50 @@ static const StaticFingerprints kPinset_
   kPinset_test_sha256_Data
 };
 
 static const StaticPinset kPinset_test = {
   nullptr,
   &kPinset_test_sha256
 };
 
-static const char* kPinset_google_sha1_Data[] = {
-  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[] = {
   kGOOGLE_PIN_GoogleG2Fingerprint,
+  kGoogleBackup2048Fingerprint,
   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,
+static const char* kPinset_tor_sha256_Data[] = {
   kTor3Fingerprint,
-};
-static const StaticFingerprints kPinset_tor_sha1 = {
-  sizeof(kPinset_tor_sha1_Data) / sizeof(const char*),
-  kPinset_tor_sha1_Data
-};
-
-static const char* kPinset_tor_sha256_Data[] = {
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
   kGOOGLE_PIN_LetsEncryptAuthorityX1Fingerprint,
+  kTor1Fingerprint,
   kGOOGLE_PIN_RapidSSLFingerprint,
   kGOOGLE_PIN_LetsEncryptAuthorityX2Fingerprint,
+  kTor2Fingerprint,
 };
 static const StaticFingerprints kPinset_tor_sha256 = {
   sizeof(kPinset_tor_sha256_Data) / sizeof(const char*),
   kPinset_tor_sha256_Data
 };
 
 static const StaticPinset kPinset_tor = {
-  &kPinset_tor_sha1,
+  nullptr,
   &kPinset_tor_sha256
 };
 
-static const char* kPinset_twitterCom_sha1_Data[] = {
-  kTwitter1Fingerprint,
-};
-static const StaticFingerprints kPinset_twitterCom_sha1 = {
-  sizeof(kPinset_twitterCom_sha1_Data) / sizeof(const char*),
-  kPinset_twitterCom_sha1_Data
-};
-
 static const char* kPinset_twitterCom_sha256_Data[] = {
   kVerisign_Class_2_Public_Primary_Certification_Authority___G2Fingerprint,
   kVerisign_Class_3_Public_Primary_Certification_Authority___G2Fingerprint,
   kGeoTrust_Global_CA_2Fingerprint,
   kDigiCert_Assured_ID_Root_CAFingerprint,
   kVerisign_Class_1_Public_Primary_Certification_Authority___G3Fingerprint,
   kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint,
   kVerisign_Class_1_Public_Primary_Certification_AuthorityFingerprint,
@@ -570,35 +548,28 @@ static const char* kPinset_twitterCom_sh
   kVerisign_Class_2_Public_Primary_Certification_Authority___G3Fingerprint,
   kGeoTrust_Universal_CA_2Fingerprint,
   kGeoTrust_Global_CAFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
   kGeoTrust_Universal_CAFingerprint,
   kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
+  kTwitter1Fingerprint,
 };
 static const StaticFingerprints kPinset_twitterCom_sha256 = {
   sizeof(kPinset_twitterCom_sha256_Data) / sizeof(const char*),
   kPinset_twitterCom_sha256_Data
 };
 
 static const StaticPinset kPinset_twitterCom = {
-  &kPinset_twitterCom_sha1,
+  nullptr,
   &kPinset_twitterCom_sha256
 };
 
-static const char* kPinset_twitterCDN_sha1_Data[] = {
-  kTwitter1Fingerprint,
-};
-static const StaticFingerprints kPinset_twitterCDN_sha1 = {
-  sizeof(kPinset_twitterCDN_sha1_Data) / sizeof(const char*),
-  kPinset_twitterCDN_sha1_Data
-};
-
 static const char* kPinset_twitterCDN_sha256_Data[] = {
   kVerisign_Class_2_Public_Primary_Certification_Authority___G2Fingerprint,
   kComodo_Trusted_Services_rootFingerprint,
   kCOMODO_Certification_AuthorityFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_Authority___G2Fingerprint,
   kAddTrust_Low_Value_Services_RootFingerprint,
   kUTN_USERFirst_Object_Root_CAFingerprint,
   kGOOGLE_PIN_GTECyberTrustGlobalRootFingerprint,
@@ -630,25 +601,26 @@ static const char* kPinset_twitterCDN_sh
   kAddTrust_External_RootFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
   kGeoTrust_Universal_CAFingerprint,
   kGOOGLE_PIN_Entrust_SSLFingerprint,
   kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
   kComodo_AAA_Services_rootFingerprint,
+  kTwitter1Fingerprint,
   kAddTrust_Qualified_Certificates_RootFingerprint,
 };
 static const StaticFingerprints kPinset_twitterCDN_sha256 = {
   sizeof(kPinset_twitterCDN_sha256_Data) / sizeof(const char*),
   kPinset_twitterCDN_sha256_Data
 };
 
 static const StaticPinset kPinset_twitterCDN = {
-  &kPinset_twitterCDN_sha1,
+  nullptr,
   &kPinset_twitterCDN_sha256
 };
 
 static const char* kPinset_dropbox_sha256_Data[] = {
   kEntrust_Root_Certification_Authority___EC1Fingerprint,
   kGOOGLE_PIN_ThawtePremiumServerFingerprint,
   kthawte_Primary_Root_CA___G3Fingerprint,
   kthawte_Primary_Root_CAFingerprint,
@@ -672,104 +644,83 @@ static const StaticFingerprints kPinset_
   kPinset_dropbox_sha256_Data
 };
 
 static const StaticPinset kPinset_dropbox = {
   nullptr,
   &kPinset_dropbox_sha256
 };
 
-static const char* kPinset_facebook_sha1_Data[] = {
-  kFacebookBackupFingerprint,
-};
-static const StaticFingerprints kPinset_facebook_sha1 = {
-  sizeof(kPinset_facebook_sha1_Data) / sizeof(const char*),
-  kPinset_facebook_sha1_Data
-};
-
 static const char* kPinset_facebook_sha256_Data[] = {
   kGOOGLE_PIN_DigiCertECCSecureServerCAFingerprint,
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
   kGOOGLE_PIN_SymantecClass3EVG3Fingerprint,
+  kFacebookBackupFingerprint,
 };
 static const StaticFingerprints kPinset_facebook_sha256 = {
   sizeof(kPinset_facebook_sha256_Data) / sizeof(const char*),
   kPinset_facebook_sha256_Data
 };
 
 static const StaticPinset kPinset_facebook = {
-  &kPinset_facebook_sha1,
+  nullptr,
   &kPinset_facebook_sha256
 };
 
-static const char* kPinset_spideroak_sha1_Data[] = {
+static const char* kPinset_spideroak_sha256_Data[] = {
   kSpiderOak2Fingerprint,
   kSpiderOak3Fingerprint,
-};
-static const StaticFingerprints kPinset_spideroak_sha1 = {
-  sizeof(kPinset_spideroak_sha1_Data) / sizeof(const char*),
-  kPinset_spideroak_sha1_Data
-};
-
-static const char* kPinset_spideroak_sha256_Data[] = {
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
   kGeoTrust_Global_CAFingerprint,
 };
 static const StaticFingerprints kPinset_spideroak_sha256 = {
   sizeof(kPinset_spideroak_sha256_Data) / sizeof(const char*),
   kPinset_spideroak_sha256_Data
 };
 
 static const StaticPinset kPinset_spideroak = {
-  &kPinset_spideroak_sha1,
+  nullptr,
   &kPinset_spideroak_sha256
 };
 
-static const char* kPinset_yahoo_sha1_Data[] = {
-  kYahooBackup2Fingerprint,
+static const char* kPinset_yahoo_sha256_Data[] = {
   kYahooBackup1Fingerprint,
-};
-static const StaticFingerprints kPinset_yahoo_sha1 = {
-  sizeof(kPinset_yahoo_sha1_Data) / sizeof(const char*),
-  kPinset_yahoo_sha1_Data
-};
-
-static const char* kPinset_yahoo_sha256_Data[] = {
   kVerisign_Class_2_Public_Primary_Certification_Authority___G2Fingerprint,
   kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint,
   kGeoTrust_Primary_Certification_AuthorityFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_Authority___G3Fingerprint,
   kVeriSign_Class_3_Public_Primary_Certification_Authority___G4Fingerprint,
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
   kVerisign_Class_2_Public_Primary_Certification_Authority___G3Fingerprint,
+  kYahooBackup2Fingerprint,
   kGeoTrust_Global_CAFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
   kGeoTrust_Universal_CAFingerprint,
   kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
 };
 static const StaticFingerprints kPinset_yahoo_sha256 = {
   sizeof(kPinset_yahoo_sha256_Data) / sizeof(const char*),
   kPinset_yahoo_sha256_Data
 };
 
 static const StaticPinset kPinset_yahoo = {
-  &kPinset_yahoo_sha1,
+  nullptr,
   &kPinset_yahoo_sha256
 };
 
 /* Domainlist */
 struct TransportSecurityPreload {
   const char* mHost;
   const bool mIncludeSubdomains;
   const bool mTestMode;
   const bool mIsMoz;
   const int32_t mId;
-  const StaticPinset *pinset;
+  const StaticPinset* pinset;
 };
 
 /* Sort hostnames for binary search. */
 static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
   { "2mdn.net", true, false, false, -1, &kPinset_google_root_pems },
   { "accounts.firefox.com", true, false, true, 4, &kPinset_mozilla_services },
   { "accounts.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "addons.mozilla.net", true, false, true, 2, &kPinset_mozilla },
@@ -1220,9 +1171,9 @@ static const TransportSecurityPreload kP
   { "za.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
 };
 
 // Pinning Preload List Length = 450;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1458993517672000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1459598124230000);