No Bug, mozilla-central repo-update HSTS HPKP blocklist remote-settin…

…gs - a=repo-update r=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D57311 --HG-- extra : moz-landing-system : lando
dothq · Dec 16, 2019 · 11ac8ca · 11ac8ca
1 parent 146ee96
commit 11ac8ca
Show file tree

Hide file tree

Showing 4 changed files with 749 additions and 504 deletions.
diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1576068160484">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1576242123974">
   <emItems>
     <emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">
       <prefs/>
@@ -3244,6 +3244,10 @@
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="3"/>
     </emItem>
+    <emItem blockID="b8daa919-7a9f-4a83-8aef-4a5d3fbfb502" id="/^((\{a4b95555-755a-4a3f-bc64-f6999377963d\})|(djamol@webdownloader)|(\{b23e59ff-5491-40f4-adb2-577d31d8778a\})|(\{90e41842-755d-40e0-9136-8129df55a644\})|(\{8e0ccf87-6ea4-4985-b07f-4d503f105d91\})|(\{69d0ae35-7d39-4c41-b455-4d751117317e\})|(\{df0dfe82-78a9-456e-9dc1-c832a94d43a7\})|(\{7bbd26d9-d245-48d3-b3a6-5e19948dfa14\})|(\{3d9109d8-463e-4dde-9416-d25c6ea995df\})|(\{2726adf8-c1f9-4ed9-baf1-9a3c1742b659\})|(\{bfc40cf5-a085-4f0b-a3ef-5e124f2e445e\})|(\{37927c18-d5a5-4187-9e6e-6a787364bd9f\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
   </emItems>
   <pluginItems>
     <pluginItem blockID="p332">

diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h
@@ -1137,4 +1137,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1584624013279000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1584969559300000);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1137,4 +1137,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {

		static const int32_t kUnknownId = -1;

		static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1584624013279000);
		static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1584969559300000);