Bug 1197607, Automated hsts & hpkp updates are failing on mozilla-central, mozilla-aurora, mozilla-esr38, r=cykesiopka

This commit is contained in:
Nick Thomas 2015-09-03 22:07:42 +12:00
parent c53cf6f454
commit 2b6fac45c5
3 changed files with 4 additions and 6 deletions

View File

@ -169,9 +169,7 @@
"StartCom Certification Authority",
"StartCom Certification Authority",
"StartCom Certification Authority G2",
"TC TrustCenter Class 2 CA II",
"TC TrustCenter Class 3 CA II",
"TC TrustCenter Universal CA I",
"TC TrustCenter Universal CA III",
// "Thawte Premium Server CA",
"thawte Primary Root CA",

View File

@ -144,8 +144,8 @@ function download(filename) {
}
function downloadAsJson(filename) {
// we have to filter out '//' comments
let result = download(filename).replace(/\/\/[^\n]*\n/g, "");
// we have to filter out '//' comments, while not mangling the json
let result = download(filename).replace(/^(\s*)?\/\/[^\n]*\n/mg, "");
let data = null;
try {
data = JSON.parse(result);

View File

@ -85,8 +85,8 @@ function download() {
throw "ERROR: could not decode data as base64 from '" + SOURCE + "': " + e;
}
// we have to filter out '//' comments
var result = resultDecoded.replace(/\/\/[^\n]*\n/g, "");
// we have to filter out '//' comments, while not mangling the json
var result = resultDecoded.replace(/^(\s*)?\/\/[^\n]*\n/mg, "");
var data = null;
try {
data = JSON.parse(result);