Skip to content

Commit

Permalink
#628: update TLDs, pins, HSTS
Browse files Browse the repository at this point in the history
  • Loading branch information
classilla committed Oct 2, 2020
1 parent bc184b4 commit 16c85bb
Show file tree
Hide file tree
Showing 3 changed files with 1,827 additions and 1,687 deletions.
38 changes: 23 additions & 15 deletions netwerk/dns/effective_tld_names.dat
Original file line number Diff line number Diff line change
Expand Up @@ -907,16 +907,18 @@ org.do
sld.do
web.do

// dz : https://en.wikipedia.org/wiki/.dz
// dz : http://www.nic.dz/images/pdf_nic/charte.pdf
dz
art.dz
asso.dz
com.dz
edu.dz
gov.dz
org.dz
net.dz
gov.dz
edu.dz
asso.dz
pol.dz
art.dz
soc.dz
tm.dz

// ec : http://www.nic.ec/reg/paso1.asp
// Submitted by registry <[email protected]>
Expand Down Expand Up @@ -4697,27 +4699,26 @@ web.ni
// ccTLD for the Netherlands
nl

// no : http://www.norid.no/regelverk/index.en.html
// The Norwegian registry has declined to notify us of updates. The web pages
// referenced below are the official source of the data. There is also an
// announce mailing list:
// https://postlister.uninett.no/sympa/info/norid-diskusjon
// no : https://www.norid.no/en/om-domenenavn/regelverk-for-no/
// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
no
// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
fhs.no
vgs.no
fylkesbibl.no
folkebibl.no
museum.no
idrett.no
priv.no
// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
mil.no
stat.no
dep.no
kommune.no
herad.no
// no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
// counties
aa.no
ah.no
Expand Down Expand Up @@ -7109,7 +7110,7 @@ org.zw

// newGTLDs

// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-09-09T17:29:56Z
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-09-17T17:33:58Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
Expand Down Expand Up @@ -9184,7 +9185,7 @@ nokia
// northwesternmutual : 2015-06-18 Northwestern Mutual Registry, LLC
northwesternmutual

// norton : 2014-12-04 Symantec Corporation
// norton : 2014-12-04 NortonLifeLock Inc.
norton

// now : 2015-06-25 Amazon Registry Services, Inc.
Expand Down Expand Up @@ -11232,6 +11233,10 @@ drud.us
// Submitted by Richard Harper <[email protected]>
duckdns.org

// Bip : https://bip.sh
// Submitted by Joel Kennedy <[email protected]>
bip.sh

// bitbridge.net : Submitted by Craig Welch, [email protected]
bitbridge.net

Expand Down Expand Up @@ -12002,6 +12007,7 @@ googleapis.com
googlecode.com
pagespeedmobilizer.com
publishproxy.com
translate.goog
withgoogle.com
withyoutube.com

Expand Down Expand Up @@ -13374,7 +13380,9 @@ cx.ua

// WP Engine : https://wpengine.com/
// Submitted by Michael Smith <[email protected]>
// Submitted by Brandon DuRette <[email protected]>
wpenginepowered.com
js.wpenginepowered.com

// Impertrix Solutions : <https://impertrixcdn.com>
// Submitted by Zhixiang Zhao <[email protected]>
Expand Down
12 changes: 11 additions & 1 deletion security/manager/ssl/StaticHPKPins.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,14 @@ static const char kGOOGLE_PIN_GeoTrustGlobal2Fingerprint[] =
static const char kGOOGLE_PIN_GoDaddySecureFingerprint[] =
"MrZLZnJ6IGPkBm87lYywqu5Xal7O/ZUzmbuIdHMdlYc=";

/* GOOGLE_PIN_R3LetsEncrypt */
static const char kGOOGLE_PIN_R3LetsEncryptFingerprint[] =
"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=";

/* GOOGLE_PIN_R4LetsEncrypt */
static const char kGOOGLE_PIN_R4LetsEncryptFingerprint[] =
"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=";

/* GOOGLE_PIN_RapidSSL */
static const char kGOOGLE_PIN_RapidSSLFingerprint[] =
"lT09gPUeQfbYrlxRtpsHrjDblj9Rpz+u7ajfCrg4qDM=";
Expand Down Expand Up @@ -481,10 +489,12 @@ static const StaticFingerprints kPinset_google = {
};

static const char* const kPinset_tor_Data[] = {
kGOOGLE_PIN_R4LetsEncryptFingerprint,
kTor3Fingerprint,
kDigiCert_High_Assurance_EV_Root_CAFingerprint,
kLet_s_Encrypt_Authority_X3Fingerprint,
kTor1Fingerprint,
kGOOGLE_PIN_R3LetsEncryptFingerprint,
kGOOGLE_PIN_RapidSSLFingerprint,
kLet_s_Encrypt_Authority_X4Fingerprint,
kTor2Fingerprint,
Expand Down Expand Up @@ -1149,4 +1159,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {

static const int32_t kUnknownId = -1;

static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1608571180297000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1610028953290000);
Loading

0 comments on commit 16c85bb

Please sign in to comment.