No bug, Automated HPKP preload list update from host bld-linux64-spot-1032 - a=hpkp-update
authorffxbld
Sat, 12 Jul 2014 03:14:42 -0700
changeset 207914 118f37e5222769749dc6341c3d8ba1c0ceb5fd3f
parent 207913 307903c83b003d38f3a38ca23777bad550157f06
child 207915 376889ab0e02a3ec83f0425d8378ed78af6fa94f
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershpkp-update
milestone32.0a2
No bug, Automated HPKP preload list update from host bld-linux64-spot-1032 - a=hpkp-update
security/manager/boot/src/StaticHPKPins.errors
security/manager/boot/src/StaticHPKPins.h
--- a/security/manager/boot/src/StaticHPKPins.errors
+++ b/security/manager/boot/src/StaticHPKPins.errors
@@ -1,30 +1,10 @@
-+ set -e
-+ OBJ=obj-x86_64-unknown-linux-gnu
-+ obj-x86_64-unknown-linux-gnu/dist/bin/run-mozilla.sh obj-x86_64-unknown-linux-gnu/dist/bin/xpcshell /home/mchew/mozilla-central/security/manager/tools/genHPKPStaticPins.js /home/mchew/mozilla-central/security/manager/tools/PreloadedHPKPins.json /home/mchew/mozilla-central/security/manager/ssl/tests/unit/tlsserver/default-ee.der /home/mchew/mozilla-central/security/manager/boot/src/StaticHPKPins.h
-[32405] WARNING: NS_ENSURE_SUCCESS(rv, nsresult::NS_ERROR_UNEXPECTED) failed with result 0x80004005: file /home/mchew/mozilla-central/extensions/cookie/nsPermissionManager.cpp, line 444
-[32405] WARNING: Forcing memory-only entry since CacheFileIOManager doesn't have mCacheDirectory.: file /home/mchew/mozilla-central/netwerk/cache2/CacheFile.cpp, line 474
-[32405] WARNING: Forcing memory-only entry since CacheFileIOManager doesn't have mCacheDirectory.: file /home/mchew/mozilla-central/netwerk/cache2/CacheFile.cpp, line 474
 Can't find hash in builtin certs for Chrome nickname RapidSSL, inserting GOOGLE_PIN_RapidSSL
 Can't find hash in builtin certs for Chrome nickname Entrust_G2, inserting GOOGLE_PIN_Entrust_G2
+Can't find hash in builtin certs for Chrome nickname Entrust_SSL, inserting GOOGLE_PIN_Entrust_SSL
+Can't find hash in builtin certs for Chrome nickname GTECyberTrustGlobalRoot, inserting GOOGLE_PIN_GTECyberTrustGlobalRoot
 Can't find hash in builtin certs for Chrome nickname Tor2web, inserting GOOGLE_PIN_Tor2web
 Can't find hash in builtin certs for Chrome nickname AlphaSSL_G2, inserting GOOGLE_PIN_AlphaSSL_G2
 Can't find hash in builtin certs for Chrome nickname CryptoCat1, inserting GOOGLE_PIN_CryptoCat1
 Can't find hash in builtin certs for Chrome nickname Libertylavabitcom, inserting GOOGLE_PIN_Libertylavabitcom
-[32405] WARNING: Forcing memory-only entry since CacheFileIOManager doesn't have mCacheDirectory.: file /home/mchew/mozilla-central/netwerk/cache2/CacheFile.cpp, line 474
-[32405] WARNING: '!mMainThread', file /home/mchew/mozilla-central/xpcom/threads/nsThreadManager.cpp, line 279
-[32405] WARNING: '!thread', file /home/mchew/mozilla-central/xpcom/glue/nsThreadUtils.cpp, line 194
-[32405] WARNING: '!thread', file /home/mchew/mozilla-central/xpcom/glue/nsThreadUtils.cpp, line 194
-[32405] WARNING: '!mMainThread', file /home/mchew/mozilla-central/xpcom/threads/nsThreadManager.cpp, line 269
-[32405] WARNING: 'NS_FAILED(rv)', file /home/mchew/mozilla-central/xpcom/glue/nsThreadUtils.cpp, line 180
-[32405] WARNING: Leaking the RDF Service.: file /home/mchew/mozilla-central/rdf/build/nsRDFModule.cpp, line 165
-[32405] WARNING: '!compMgr', file /home/mchew/mozilla-central/xpcom/glue/nsComponentManagerUtils.cpp, line 59
-[32405] WARNING: XPCOM objects created/destroyed from static ctor/dtor: file /home/mchew/mozilla-central/xpcom/base/nsTraceRefcnt.cpp, line 148
-[32405] WARNING: XPCOM objects created/destroyed from static ctor/dtor: file /home/mchew/mozilla-central/xpcom/base/nsTraceRefcnt.cpp, line 148
-nsStringStats
- => mAllocCount:           3577
- => mReallocCount:          444
- => mFreeCount:            3577
- => mShareCount:           8797
- => mAdoptCount:            177
- => mAdoptFreeCount:        177
- => Process ID: 32405, Thread ID: 140248381782592
+Can't find hash in builtin certs for Chrome nickname EntrustRootEC1, inserting GOOGLE_PIN_EntrustRootEC1
+Can't find hash in builtin certs for Chrome nickname GoDaddySecure, inserting GOOGLE_PIN_GoDaddySecure
--- a/security/manager/boot/src/StaticHPKPins.h
+++ b/security/manager/boot/src/StaticHPKPins.h
@@ -94,20 +94,16 @@ static const char kEnd_Entity_Test_CertF
 /* Entrust Root Certification Authority */
 static const char kEntrust_Root_Certification_AuthorityFingerprint[] =
   "bb+uANN7nNc/j7R95lkXrwDg3d9C286sIMF8AnXuIJU=";
 
 /* Entrust.net Premium 2048 Secure Server CA */
 static const char kEntrust_net_Premium_2048_Secure_Server_CAFingerprint[] =
   "HqPF5D7WbC2imDpCpKebHpBnhs6fG1hiFBmgBGOofTg=";
 
-/* Entrust.net Secure Server CA */
-static const char kEntrust_net_Secure_Server_CAFingerprint[] =
-  "nsxRNo6G40YPZsKV5JQt1TCA8nseQQr/LRqp1Oa8fnw=";
-
 /* Equifax Secure CA */
 static const char kEquifax_Secure_CAFingerprint[] =
   "/1aAzXOlcD2gSBegdf1GJQanNQbEuBoVg+9UlHjSZHY=";
 
 /* Equifax Secure Global eBusiness CA */
 static const char kEquifax_Secure_Global_eBusiness_CAFingerprint[] =
   "pvH5v4oKndwID7SbHvw9GhwsMtwOE2pbAMlzFvKj3BE=";
 
@@ -118,36 +114,48 @@ static const char kEquifax_Secure_eBusin
 /* GOOGLE_PIN_AlphaSSL_G2 */
 static const char kGOOGLE_PIN_AlphaSSL_G2Fingerprint[] =
   "yxgiWGK++SFB9ySwt3M3qpn5HO0ZLFY5D+h+G/vcT/c=";
 
 /* GOOGLE_PIN_CryptoCat1 */
 static const char kGOOGLE_PIN_CryptoCat1Fingerprint[] =
   "vKaqtTLWmVuXPVJE+0OqN5sRc4VCcSQHI/W3XTDVR24=";
 
+/* GOOGLE_PIN_EntrustRootEC1 */
+static const char kGOOGLE_PIN_EntrustRootEC1Fingerprint[] =
+  "/qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=";
+
 /* GOOGLE_PIN_Entrust_G2 */
 static const char kGOOGLE_PIN_Entrust_G2Fingerprint[] =
   "du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at/U=";
 
+/* GOOGLE_PIN_Entrust_SSL */
+static const char kGOOGLE_PIN_Entrust_SSLFingerprint[] =
+  "nsxRNo6G40YPZsKV5JQt1TCA8nseQQr/LRqp1Oa8fnw=";
+
+/* GOOGLE_PIN_GTECyberTrustGlobalRoot */
+static const char kGOOGLE_PIN_GTECyberTrustGlobalRootFingerprint[] =
+  "EGn6R6CqT4z3ERscrqNl7q7RC//zJmDe9uBhS/rnCHU=";
+
+/* GOOGLE_PIN_GoDaddySecure */
+static const char kGOOGLE_PIN_GoDaddySecureFingerprint[] =
+  "MrZLZnJ6IGPkBm87lYywqu5Xal7O/ZUzmbuIdHMdlYc=";
+
 /* GOOGLE_PIN_Libertylavabitcom */
 static const char kGOOGLE_PIN_LibertylavabitcomFingerprint[] =
   "WnKzsDXgqPtS1KvtImrhQPqcxfpmfssuI2cSJt4LMks=";
 
 /* GOOGLE_PIN_RapidSSL */
 static const char kGOOGLE_PIN_RapidSSLFingerprint[] =
   "lT09gPUeQfbYrlxRtpsHrjDblj9Rpz+u7ajfCrg4qDM=";
 
 /* GOOGLE_PIN_Tor2web */
 static const char kGOOGLE_PIN_Tor2webFingerprint[] =
   "99ogQzjMuUTBkG1ZP7FME0K4kvBEti8Buzu4nZjRItM=";
 
-/* GTE CyberTrust Global Root */
-static const char kGTE_CyberTrust_Global_RootFingerprint[] =
-  "EGn6R6CqT4z3ERscrqNl7q7RC//zJmDe9uBhS/rnCHU=";
-
 /* GeoTrust Global CA */
 static const char kGeoTrust_Global_CAFingerprint[] =
   "h6801m+z8v3zbgkRHpq6L29Esgfzhj89C1SyUCOQmqU=";
 
 /* GeoTrust Global CA 2 */
 static const char kGeoTrust_Global_CA_2Fingerprint[] =
   "F3VaXClfPS1y5vAxofB/QAxYi55YKyLxfq4xoVkNEYU=";
 
@@ -198,20 +206,16 @@ static const char kGoogleBackup2048Finge
 /* GoogleG2 */
 static const char kGoogleG2Fingerprint[] =
   "Q9rWMO5T+KmAym79hfRqo3mQ4Oo=";
 
 /* Network Solutions Certificate Authority */
 static const char kNetwork_Solutions_Certificate_AuthorityFingerprint[] =
   "MtGA7THJNVieydu7ciEjuIO1/C3BD5/KOpXXfhv8tTQ=";
 
-/* RSA Root Certificate 1 */
-static const char kRSA_Root_Certificate_1Fingerprint[] =
-  "Blb1lVIEyNK8ixykdeKk+m4STRJFEnhBV8hYtVRxFBo=";
-
 /* 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=";
 
@@ -282,24 +286,16 @@ static const char kUTN_USERFirst_Email_R
 /* UTN USERFirst Hardware Root CA */
 static const char kUTN_USERFirst_Hardware_Root_CAFingerprint[] =
   "TUDnr0MEoJ3of7+YliBMBVFB4/gJsv5zO7IxD9+YoWI=";
 
 /* UTN USERFirst Object Root CA */
 static const char kUTN_USERFirst_Object_Root_CAFingerprint[] =
   "D+FMJksXu28NZT56cOs2Pb9UvhWAOe3a5cJXEd9IwQM=";
 
-/* ValiCert Class 1 VA */
-static const char kValiCert_Class_1_VAFingerprint[] =
-  "Md4MsZ8q27DRzXsbMe+O4+tZt0RZrvlLSAvu7rhcZMk=";
-
-/* ValiCert Class 2 VA */
-static const char kValiCert_Class_2_VAFingerprint[] =
-  "CT23Z4iPaxMnVV29Qrtck/7exQRMeoS8bqMqV4wiNcA=";
-
 /* VeriSign Class 3 Public Primary Certification Authority - G4 */
 static const char kVeriSign_Class_3_Public_Primary_Certification_Authority___G4Fingerprint[] =
   "UZJDjsNp1+4M5x9cbbdflB779y5YRBcV6Z6rBMLIrO4=";
 
 /* VeriSign Class 3 Public Primary Certification Authority - G5 */
 static const char kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint[] =
   "JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg=";
 
@@ -374,33 +370,29 @@ static const char* kPinset_google_root_p
   kCOMODO_ECC_Certification_AuthorityFingerprint,
   kStartCom_Certification_AuthorityFingerprint,
   kStartCom_Certification_AuthorityFingerprint,
   kThawte_Premium_Server_CAFingerprint,
   kCOMODO_Certification_AuthorityFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_Authority___G2Fingerprint,
   kXRamp_Global_CA_RootFingerprint,
   kAddTrust_Low_Value_Services_RootFingerprint,
-  kRSA_Root_Certificate_1Fingerprint,
-  kValiCert_Class_2_VAFingerprint,
-  kGTE_CyberTrust_Global_RootFingerprint,
   kGeoTrust_Global_CA_2Fingerprint,
   kStartCom_Certification_Authority_G2Fingerprint,
   kStarfield_Class_2_CAFingerprint,
   kthawte_Primary_Root_CA___G3Fingerprint,
   kthawte_Primary_Root_CAFingerprint,
   kEntrust_net_Premium_2048_Secure_Server_CAFingerprint,
   kDigiCert_Assured_ID_Root_CAFingerprint,
   kAmerica_Online_Root_Certification_Authority_1Fingerprint,
   kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint,
   kEquifax_Secure_eBusiness_CA_1Fingerprint,
   kGlobalSign_Root_CAFingerprint,
   kGo_Daddy_Root_Certificate_Authority___G2Fingerprint,
   kStarfield_Services_Root_Certificate_Authority___G2Fingerprint,
-  kValiCert_Class_1_VAFingerprint,
   kAffirmTrust_Premium_ECCFingerprint,
   kNetwork_Solutions_Certificate_AuthorityFingerprint,
   kAddTrust_Public_Services_RootFingerprint,
   kUTN_DATACorp_SGC_Root_CAFingerprint,
   kComodo_Secure_Services_rootFingerprint,
   kGeoTrust_Primary_Certification_AuthorityFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_Authority___G3Fingerprint,
   kUTN_USERFirst_Hardware_Root_CAFingerprint,
@@ -419,31 +411,30 @@ static const char* kPinset_google_root_p
   kGeoTrust_Global_CAFingerprint,
   kGlobalSign_Root_CA___R2Fingerprint,
   kTC_TrustCenter_Class_3_CA_IIFingerprint,
   kAffirmTrust_NetworkingFingerprint,
   kAddTrust_External_RootFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
   kGeoTrust_Universal_CAFingerprint,
   kThawte_Server_CAFingerprint,
-  kEntrust_net_Secure_Server_CAFingerprint,
   kEquifax_Secure_Global_eBusiness_CAFingerprint,
   kTC_TrustCenter_Universal_CA_IIIFingerprint,
   kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
   kTC_TrustCenter_Class_2_CA_IIFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_AuthorityFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_AuthorityFingerprint,
   kTC_TrustCenter_Universal_CA_IFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
   kComodo_AAA_Services_rootFingerprint,
   kAffirmTrust_PremiumFingerprint,
   kAddTrust_Qualified_Certificates_RootFingerprint,
 };
-static const StaticFingerprints kPinset_google_root_pems_sha256 = { 69, kPinset_google_root_pems_sha256_Data };
+static const StaticFingerprints kPinset_google_root_pems_sha256 = { 64, kPinset_google_root_pems_sha256_Data };
 
 static const StaticPinset kPinset_google_root_pems = {
   nullptr,
   &kPinset_google_root_pems_sha256
 };
 
 static const char* kPinset_mozilla_sha256_Data[] = {
   kGeoTrust_Global_CA_2Fingerprint,
@@ -577,17 +568,17 @@ static const StaticFingerprints kPinset_
 
 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,
-  kGTE_CyberTrust_Global_RootFingerprint,
+  kGOOGLE_PIN_GTECyberTrustGlobalRootFingerprint,
   kGeoTrust_Global_CA_2Fingerprint,
   kEntrust_net_Premium_2048_Secure_Server_CAFingerprint,
   kDigiCert_Assured_ID_Root_CAFingerprint,
   kVerisign_Class_1_Public_Primary_Certification_Authority___G3Fingerprint,
   kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint,
   kGlobalSign_Root_CAFingerprint,
   kUTN_USERFirst_Email_Root_CAFingerprint,
   kVerisign_Class_1_Public_Primary_Certification_AuthorityFingerprint,
@@ -606,17 +597,17 @@ static const char* kPinset_twitterCDN_sh
   kGlobalSign_Root_CA___R3Fingerprint,
   kGOOGLE_PIN_Entrust_G2Fingerprint,
   kGeoTrust_Universal_CA_2Fingerprint,
   kGeoTrust_Global_CAFingerprint,
   kGlobalSign_Root_CA___R2Fingerprint,
   kAddTrust_External_RootFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
   kGeoTrust_Universal_CAFingerprint,
-  kEntrust_net_Secure_Server_CAFingerprint,
+  kGOOGLE_PIN_Entrust_SSLFingerprint,
   kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_AuthorityFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
   kComodo_AAA_Services_rootFingerprint,
   kAddTrust_Qualified_Certificates_RootFingerprint,
 };
 static const StaticFingerprints kPinset_twitterCDN_sha256 = { 42, kPinset_twitterCDN_sha256_Data };
@@ -653,16 +644,43 @@ static const char* kPinset_lavabit_sha25
 };
 static const StaticFingerprints kPinset_lavabit_sha256 = { 1, kPinset_lavabit_sha256_Data };
 
 static const StaticPinset kPinset_lavabit = {
   nullptr,
   &kPinset_lavabit_sha256
 };
 
+static const char* kPinset_dropbox_sha256_Data[] = {
+  kGOOGLE_PIN_EntrustRootEC1Fingerprint,
+  kThawte_Premium_Server_CAFingerprint,
+  kthawte_Primary_Root_CA___G3Fingerprint,
+  kthawte_Primary_Root_CAFingerprint,
+  kEntrust_net_Premium_2048_Secure_Server_CAFingerprint,
+  kDigiCert_Assured_ID_Root_CAFingerprint,
+  kGo_Daddy_Root_Certificate_Authority___G2Fingerprint,
+  kGOOGLE_PIN_GoDaddySecureFingerprint,
+  kGeoTrust_Primary_Certification_AuthorityFingerprint,
+  kGo_Daddy_Class_2_CAFingerprint,
+  kDigiCert_High_Assurance_EV_Root_CAFingerprint,
+  kthawte_Primary_Root_CA___G2Fingerprint,
+  kEntrust_Root_Certification_AuthorityFingerprint,
+  kGOOGLE_PIN_Entrust_G2Fingerprint,
+  kGeoTrust_Global_CAFingerprint,
+  kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
+  kDigiCert_Global_Root_CAFingerprint,
+  kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
+};
+static const StaticFingerprints kPinset_dropbox_sha256 = { 18, kPinset_dropbox_sha256_Data };
+
+static const StaticPinset kPinset_dropbox = {
+  nullptr,
+  &kPinset_dropbox_sha256
+};
+
 /* Domainlist */
 struct TransportSecurityPreload {
   const char* mHost;
   const bool mIncludeSubdomains;
   const bool mTestMode;
   const bool mIsMoz;
   const int32_t mId;
   const StaticPinset *pinset;
@@ -697,16 +715,17 @@ static const TransportSecurityPreload kP
   { "codereview.chromium.org", true, true, false, -1, &kPinset_google_root_pems },
   { "crypto.cat", false, true, false, -1, &kPinset_cryptoCat },
   { "dev.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "dist.torproject.org", true, true, false, -1, &kPinset_tor },
   { "dl.google.com", true, true, false, -1, &kPinset_google_root_pems },
   { "docs.google.com", true, true, false, -1, &kPinset_google_root_pems },
   { "doubleclick.net", true, true, false, -1, &kPinset_google_root_pems },
   { "drive.google.com", true, true, false, -1, &kPinset_google_root_pems },
+  { "dropbox.com", false, true, false, -1, &kPinset_dropbox },
   { "encrypted.google.com", true, true, false, -1, &kPinset_google_root_pems },
   { "exclude-subdomains.pinning.example.com", false, false, false, 0, &kPinset_mozilla_test },
   { "g.co", true, true, false, -1, &kPinset_google_root_pems },
   { "glass.google.com", true, true, false, -1, &kPinset_google_root_pems },
   { "gmail.com", false, true, false, -1, &kPinset_google_root_pems },
   { "goo.gl", true, true, false, -1, &kPinset_google_root_pems },
   { "google-analytics.com", true, true, false, -1, &kPinset_google_root_pems },
   { "google.ac", true, true, false, -1, &kPinset_google_root_pems },
@@ -915,17 +934,16 @@ static const TransportSecurityPreload kP
   { "google.st", true, true, false, -1, &kPinset_google_root_pems },
   { "google.td", true, true, false, -1, &kPinset_google_root_pems },
   { "google.tg", true, true, false, -1, &kPinset_google_root_pems },
   { "google.tk", true, true, false, -1, &kPinset_google_root_pems },
   { "google.tl", true, true, false, -1, &kPinset_google_root_pems },
   { "google.tm", true, true, false, -1, &kPinset_google_root_pems },
   { "google.tn", true, true, false, -1, &kPinset_google_root_pems },
   { "google.to", true, true, false, -1, &kPinset_google_root_pems },
-  { "google.tp", true, true, false, -1, &kPinset_google_root_pems },
   { "google.tt", true, true, false, -1, &kPinset_google_root_pems },
   { "google.us", true, true, false, -1, &kPinset_google_root_pems },
   { "google.uz", true, true, false, -1, &kPinset_google_root_pems },
   { "google.vg", true, true, false, -1, &kPinset_google_root_pems },
   { "google.vu", true, true, false, -1, &kPinset_google_root_pems },
   { "google.ws", true, true, false, -1, &kPinset_google_root_pems },
   { "googleadservices.com", true, true, false, -1, &kPinset_google_root_pems },
   { "googleapis.com", true, true, false, -1, &kPinset_google_root_pems },
@@ -980,23 +998,24 @@ static const TransportSecurityPreload kP
   { "wf-demo-eu.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "wf-demo-hrd.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "wf-dogfood-hrd.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "wf-pentest.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "wf-staging-hr.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "wf-training-hrd.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "wf-training-master.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "wf-trial-hrd.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
+  { "www.dropbox.com", true, true, false, -1, &kPinset_dropbox },
   { "www.gmail.com", false, true, false, -1, &kPinset_google_root_pems },
   { "www.googlemail.com", false, true, false, -1, &kPinset_google_root_pems },
   { "www.torproject.org", true, true, false, -1, &kPinset_tor },
   { "www.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "xbrlsuccess.appspot.com", true, true, false, -1, &kPinset_google_root_pems },
   { "youtu.be", true, true, false, -1, &kPinset_google_root_pems },
   { "youtube.com", true, true, false, -1, &kPinset_google_root_pems },
   { "ytimg.com", true, true, false, -1, &kPinset_google_root_pems },
 };
 
-static const int kPublicKeyPinningPreloadListLength = 323;
+static const int kPublicKeyPinningPreloadListLength = 324;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1412966638293000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1413626816285000);