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/D39331

--HG--
extra : moz-landing-system : lando
  • Loading branch information
ffxbld committed Jul 25, 2019
1 parent d55d460 commit b782872
Show file tree
Hide file tree
Showing 5 changed files with 2,293 additions and 194 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 lastupdate="1563367115113" xmlns="http://www.mozilla.org/2006/addons-blocklist">
<blocklist lastupdate="1563810026497" xmlns="http://www.mozilla.org/2006/addons-blocklist">
<emItems>
<emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">
<prefs/>
Expand Down Expand Up @@ -3317,6 +3317,10 @@
<prefs/>
<versionRange minVersion="0" maxVersion="*" severity="3"/>
</emItem>
<emItem blockID="eeaa940b-b984-43da-88ce-d26891347e3d" id="/^((\{86f185bb-b672-4a24-b3d9-a8751231b687\})|(\{8d98cfc9-3757-4fd9-b017-30ad60fb94ed\})|(\{288a7d51-4627-44c9-8cf0-cf18742a6f67\})|(\{49e5562b-38e2-4292-8080-ca3ffe8cea42\}))$/">
<prefs/>
<versionRange minVersion="0" maxVersion="*" severity="3"/>
</emItem>
</emItems>
<pluginItems>
<pluginItem blockID="p332">
Expand Down
18 changes: 12 additions & 6 deletions netwerk/dns/effective_tld_names.dat
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ vic.au
wa.au
// 3LDs
act.edu.au
catholic.edu.au
eq.edu.au
nsw.edu.au
nt.edu.au
qld.edu.au
Expand All @@ -255,6 +257,9 @@ sa.gov.au
tas.gov.au
vic.gov.au
wa.gov.au
// 4LDs
education.tas.edu.au
schools.nsw.edu.au

// aw : https://en.wikipedia.org/wiki/.aw
aw
Expand Down Expand Up @@ -7012,7 +7017,7 @@ xxx
// ye : http://www.y.net.ye/services/domain_name.htm
*.ye

// za : http://www.zadna.org.za/content/page/domain-information
// za : https://www.zadna.org.za/content/page/domain-information/
ac.za
agric.za
alt.za
Expand All @@ -7024,6 +7029,7 @@ law.za
mil.za
net.za
ngo.za
nic.za
nis.za
nom.za
org.za
Expand Down Expand Up @@ -12672,11 +12678,6 @@ my-firewall.org
myfirewall.org
spdns.org

// SensioLabs, SAS : https://sensiolabs.com/
// Submitted by Fabien Potencier <[email protected]>
*.s5y.io
*.sensiosite.cloud

// Service Online LLC : http://drs.ua/
// Submitted by Serhii Bulakh <[email protected]>
biz.ua
Expand Down Expand Up @@ -12766,6 +12767,11 @@ temp-dns.com
applicationcloud.io
scapp.io

// Symfony, SAS : https://symfony.com/
// Submitted by Fabien Potencier <[email protected]>
*.s5y.io
*.sensiosite.cloud

// Syncloud : https://syncloud.org
// Submitted by Boris Rybalkin <[email protected]>
syncloud.it
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 @@ -1155,4 +1155,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {

static const int32_t kUnknownId = -1;

static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1572268238939000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1572526488850000);
Loading

0 comments on commit b782872

Please sign in to comment.