Skip to content

Commit

Permalink
No Bug, mozilla-central repo-update HSTS HPKP blocklist remote-settin…
Browse files Browse the repository at this point in the history
…gs tld-suffixes - a=repo-update r=RyanVM

Differential Revision: https://phabricator.services.mozilla.com/D53009

--HG--
extra : moz-landing-system : lando
  • Loading branch information
ffxbld committed Nov 14, 2019
1 parent 58ed80e commit 6e44b2a
Show file tree
Hide file tree
Showing 6 changed files with 1,002 additions and 501 deletions.
6 changes: 5 additions & 1 deletion browser/app/blocklist.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1573321790405">
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1573507879434">
<emItems>
<emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">
<prefs/>
Expand Down Expand Up @@ -3545,6 +3545,10 @@
<prefs/>
<versionRange minVersion="0" maxVersion="*" severity="3"/>
</emItem>
<emItem blockID="53d8f35e-99ec-44fd-8082-3b713a5afcb3" id="[email protected]">
<prefs/>
<versionRange minVersion="0" maxVersion="*" severity="3"/>
</emItem>
</emItems>
<pluginItems>
<pluginItem blockID="p332">
Expand Down
4 changes: 2 additions & 2 deletions netwerk/dns/effective_tld_names.dat
Original file line number Diff line number Diff line change
Expand Up @@ -7078,7 +7078,7 @@ org.zw

// newGTLDs

// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-10-29T17:00:12Z
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-11-12T17:05:57Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
Expand Down Expand Up @@ -9462,7 +9462,7 @@ qpon
// quebec : 2013-12-19 PointQuébec Inc
quebec

// quest : 2015-03-26 Quest ION Limited
// quest : 2015-03-26 XYZ.COM LLC
quest

// qvc : 2015-07-30 QVC, Inc.
Expand Down
2 changes: 1 addition & 1 deletion security/manager/ssl/StaticHPKPins.h
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(1581945106781000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1582205640712000);
Loading

0 comments on commit 6e44b2a

Please sign in to comment.