wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1005364: Disable pinning for all mozilla properties (r=keeler)

Browse Source
This commit is contained in:
Monica Chew 2014-05-04 17:05:58 -07:00
parent 28ed4f661d
commit 1295971f2d
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/manager/boot/src/StaticHPKPins.h
View File

@ -191,15 +191,10 @@ typedef struct {
} TransportSecurityPreload; } TransportSecurityPreload;
static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "addons.mozilla.net", true, &kPinSet_mozilla },
{ "addons.mozilla.org", true, &kPinSet_mozilla },
{ "cdn.mozilla.net", true, &kPinSet_mozilla_cdn },
{ "cdn.mozilla.org", true, &kPinSet_mozilla_cdn },
{ "exclude-subdomains.pinning.example.com", false, &kPinSet_mozilla_test }, { "exclude-subdomains.pinning.example.com", false, &kPinSet_mozilla_test },
{ "include-subdomains.pinning.example.com", true, &kPinSet_mozilla_test }, { "include-subdomains.pinning.example.com", true, &kPinSet_mozilla_test },
{ "media.mozilla.com", true, &kPinSet_mozilla_cdn },
}; };
static const int kPublicKeyPinningPreloadListLength = 7; static const int kPublicKeyPinningPreloadListLength = 2;
const PRTime kPreloadPKPinsExpirationTime = INT64_C(1409867186821000); const PRTime kPreloadPKPinsExpirationTime = INT64_C(1410109244157000);

11
security/manager/tools/PreloadedHPKPins.json
View File

@ -93,11 +93,12 @@
], ],
"entries": [ "entries": [
{ "name": "addons.mozilla.org", "include_subdomains": true, "pins": "mozilla" }, // Disable until bug 1005653 is fixed.
{ "name": "addons.mozilla.net", "include_subdomains": true, "pins": "mozilla" }, // { "name": "addons.mozilla.org", "include_subdomains": true, "pins": "mozilla" },
{ "name": "cdn.mozilla.net", "include_subdomains": true, "pins": "mozilla_cdn" }, // { "name": "addons.mozilla.net", "include_subdomains": true, "pins": "mozilla" },
{ "name": "cdn.mozilla.org", "include_subdomains": true, "pins": "mozilla_cdn" }, // { "name": "cdn.mozilla.net", "include_subdomains": true, "pins": "mozilla_cdn" },
{ "name": "media.mozilla.com", "include_subdomains": true, "pins": "mozilla_cdn" }, // { "name": "cdn.mozilla.org", "include_subdomains": true, "pins": "mozilla_cdn" },
// { "name": "media.mozilla.com", "include_subdomains": true, "pins": "mozilla_cdn" },
{ "name": "include-subdomains.pinning.example.com", "include_subdomains": true, "pins": "mozilla_test" }, { "name": "include-subdomains.pinning.example.com", "include_subdomains": true, "pins": "mozilla_test" },
{ "name": "exclude-subdomains.pinning.example.com", "include_subdomains": false, "pins": "mozilla_test" } { "name": "exclude-subdomains.pinning.example.com", "include_subdomains": false, "pins": "mozilla_test" }
] ]