No Bug, mozilla-beta repo-update HSTS HPKP blocklist remote-settings - a=repo-update r=RyanVM
authorffxbld <ffxbld@mozilla.com>
Mon, 09 Jul 2018 07:31:46 -0400
changeset 477859 89ffee2e777769ae329d533c6be2b720ecec6b42
parent 477858 79a74d674f47fb09c1a285d7eebdb5235f5e910d
child 477860 eac62098b0f6b53c87b9edf283257dc962154257
push id9447
push userryanvm@gmail.com
push dateMon, 09 Jul 2018 11:32:10 +0000
treeherdermozilla-beta@89ffee2e7777 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrepo-update, RyanVM
milestone62.0
No Bug, mozilla-beta repo-update HSTS HPKP blocklist remote-settings - a=repo-update r=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D2024
browser/app/blocklist.xml
security/manager/ssl/StaticHPKPins.h
security/manager/ssl/nsSTSPreloadList.inc
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -148,17 +148,17 @@
     <emItem blockID="i922" id="{34712C68-7391-4c47-94F3-8F88D49AD632}">
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="3">
         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
           <versionRange maxVersion="*" minVersion="39.0a1"/>
         </targetApplication>
       </versionRange>
     </emItem>
-    <emItem blockID="i53" id="{a3a5c777-f583-4fef-9380-ab4add1bc2a8}">
+    <emItem blockID="i142" id="{a3a5c777-f583-4fef-9380-ab4add1bc2a8}">
       <prefs/>
       <versionRange minVersion="4.2" maxVersion="4.2" severity="3"/>
       <versionRange minVersion="2.0.3" maxVersion="2.0.3" severity="3"/>
     </emItem>
     <emItem blockID="i578" id="jid1-XLjasWL55iEE1Q@jetpack">
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="3"/>
     </emItem>
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -1160,9 +1160,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 = 487;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1539255418209000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1539602346476000);
--- a/security/manager/ssl/nsSTSPreloadList.inc
+++ b/security/manager/ssl/nsSTSPreloadList.inc
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*****************************************************************************/
 /* This is an automatically generated file. If you're not                    */
 /* nsSiteSecurityService.cpp, you shouldn't be #including it.                */
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1541671706224000);
+const PRTime gPreloadListExpirationTime = INT64_C(1542021399131000);
 %%
 0-1.party, 1
 0.me.uk, 1
 0005pay.com, 1
 00100010.net, 1
 0010100.net, 1
 00120012.net, 1
 00130013.net, 1