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

security/manager/tools/PreloadedHPKPins.json

@@ -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",

security/manager/tools/genHPKPStaticPins.js

@@ -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);

security/manager/tools/getHSTSPreloadList.js

@@ -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);