mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1092606: Filter out duplicate pinsets as well as domains (r=keeler)
This commit is contained in:
parent
0c433f5188
commit
2d3f38456b
@ -530,7 +530,9 @@ function writeFile(certNameToSKD, certSKDToName,
|
||||
// Compute used pins from both Chrome's and our pinsets, so we can output
|
||||
// them later.
|
||||
let usedFingerprints = {};
|
||||
let mozillaPins = {};
|
||||
gStaticPins.pinsets.forEach(function(pinset) {
|
||||
mozillaPins[pinset.name] = true;
|
||||
// We aren't guaranteed to have sha1_hashes in our own JSON.
|
||||
if (pinset.sha1_hashes) {
|
||||
pinset.sha1_hashes.forEach(function(name) {
|
||||
@ -573,8 +575,13 @@ function writeFile(certNameToSKD, certSKDToName,
|
||||
});
|
||||
writeString("/* Chrome static pinsets */\n");
|
||||
for (let key in chromeImportedPinsets) {
|
||||
if (mozillaPins[key]) {
|
||||
dump("Skipping duplicate pinset " + key + "\n");
|
||||
} else {
|
||||
dump("Writing pinset " + key + "\n");
|
||||
writeFullPinset(certNameToSKD, certSKDToName, chromeImportedPinsets[key]);
|
||||
}
|
||||
}
|
||||
|
||||
// Write the domainlist entries.
|
||||
writeString(DOMAINHEADER);
|
||||
|
Loading…
Reference in New Issue
Block a user