mirror of
https://github.com/roytam1/mozilla45esr.git
synced 2026-05-29 17:38:37 +00:00
import changes from tenfourfox:
- closes #557: M1502799 (M1526218, M1528909, M1540221, partial M1484980 with future expansion (695f6a162) - closes #555: shavar cryptominer auto import into adblock (also remove old 52 import script) (78e9f2e0e) - #559: update certs, pins, TLDs, miners (1bc40339f) - #561: M1544386 (apply to FPR14 for SPR1) (44e037bfb) - #562: ICU 56.2 sync to upstream (1fd25c510) - #561: cleanup (b19941fdf)
This commit is contained in:
@@ -704,6 +704,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
|
||||
{ "chrome-devtools-frontend.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "chrome.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "chrome.google.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "chromereporting-pa.googleapis.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "chromiumbugs.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "chromiumcodereview.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "cl.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
|
||||
@@ -716,6 +717,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
|
||||
{ "codereview.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "codereview.chromium.org", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "contributor.google.com", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "corp.goog", true, false, false, -1, &kPinset_google_root_pems },
|
||||
{ "cr.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
|
||||
{ "crash-reports-xpsp2.mozilla.com", false, false, true, 11, &kPinset_mozilla_services },
|
||||
{ "crash-reports.mozilla.com", false, false, true, 10, &kPinset_mozilla_services },
|
||||
@@ -1148,8 +1150,8 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
|
||||
{ "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
|
||||
};
|
||||
|
||||
// Pinning Preload List Length = 485;
|
||||
// Pinning Preload List Length = 487;
|
||||
|
||||
static const int32_t kUnknownId = -1;
|
||||
|
||||
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1565872223105000);
|
||||
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1568896814931000);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user