Remove cacert platform (EFForg#14875)

jeremyn · Hainish · commit 24b04f310f8a · 2018-03-09T17:48:42.000-08:00
diff --git a/chromium/background-scripts/rules.js b/chromium/background-scripts/rules.js
@@ -255,7 +255,7 @@ RuleSets.prototype = {
     }
 
     // If a ruleset declares a platform, and we don't match it, treat it as
-    // off-by-default. In practice, this excludes "mixedcontent" & "cacert" rules.
+    // off-by-default. In practice, this excludes "mixedcontent" rules.
     var platform = ruletag["platform"]
     if (platform) {
       default_state = false;
@@ -460,7 +460,7 @@ RuleSets.prototype = {
     }
 
     // If a ruleset declares a platform, and we don't match it, treat it as
-    // off-by-default. In practice, this excludes "mixedcontent" & "cacert" rules.
+    // off-by-default. In practice, this excludes "mixedcontent" rules.
     var platform = ruletag.getAttribute("platform");
     if (platform) {
       default_state = false;
diff --git a/src/chrome/content/rules/CAcert.xml b/src/chrome/content/rules/CAcert.xml
@@ -14,7 +14,7 @@ Fetch error: http://cacert.com/ => https://cacert.com/: (60, 'SSL certificate pr
 Fetch error: http://www.cacert.com/ => https://www.cacert.com/: (60, 'SSL certificate problem: self signed certificate in certificate chain')
 
 -->
-<ruleset name="CACert.org (CAcert)" platform="cacert" default_off='failed ruleset test'>
+<ruleset name="CACert.org (CAcert)" default_off='failed ruleset test'>
 	<target host=             "cacert.org" />
 	<target host=        "blog.cacert.org" />
 	<target host=        "bugs.cacert.org" />
diff --git a/src/chrome/content/rules/CHDK.xml b/src/chrome/content/rules/CHDK.xml
@@ -4,7 +4,7 @@
 		- Someserver.xml
 
 -->
-<ruleset name="CHDK" default_off="mismatched" platform="cacert">
+<ruleset name="CHDK" default_off="mismatched">
 
 	<!--	Cert:	www.someserver.de	-->
 	<target host="mighty-hoernsche.de" />
diff --git a/src/chrome/content/rules/Flaska.net.xml b/src/chrome/content/rules/Flaska.net.xml
@@ -23,7 +23,7 @@
 	* Secured by us
 
 -->
-<ruleset name="Flaska.net (partial)" platform="cacert">
+<ruleset name="Flaska.net (partial)" default_off="missing certificate chain">
 
 	<target host="*.flaska.net" />
 		<!--exclusion pattern="^http://jkt\.flaska\.net/" /-->
diff --git a/src/chrome/content/rules/Jensge.org.xml b/src/chrome/content/rules/Jensge.org.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.jensge.org/ => https://jensge.org/: (60, 'SSL certificat
 		- www	(mismatched, CN: www.webstreams.de)
 
 -->
-<ruleset name="jensge.org" platform="cacert" default_off='failed ruleset test'>
+<ruleset name="jensge.org" default_off='failed ruleset test'>
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/Le_Loop.org.xml b/src/chrome/content/rules/Le_Loop.org.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.leloop.org/ => https://www.leloop.org/: (60, 'SSL certif
 		- links.leloop.org
 
 -->
-<ruleset name="Le Loop.org" platform="cacert" default_off='failed ruleset test'>
+<ruleset name="Le Loop.org" default_off='failed ruleset test'>
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/LinuxTag.org.xml b/src/chrome/content/rules/LinuxTag.org.xml
@@ -9,7 +9,7 @@
 		- openmusic.linuxtag.org
 
 -->
-<ruleset name="LinuxTag.org" platform="cacert">
+<ruleset name="LinuxTag.org" default_off="missing certificate chain">
 	<target host="linuxtag.org" />
 	<target host="www.linuxtag.org" />
 	<target host="intern.linuxtag.org" />
diff --git a/src/chrome/content/rules/Lolnet.org.xml b/src/chrome/content/rules/Lolnet.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://lolnet.org/ => https://www.lolnet.org/: (60, 'SSL certificat
 		- ^	(cert only matches *.lolnet.org)
 
 -->
-<ruleset name="lolnet.org" platform="cacert" default_off='failed ruleset test'>
+<ruleset name="lolnet.org" default_off='failed ruleset test'>
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/Micro_Polia.xml b/src/chrome/content/rules/Micro_Polia.xml
@@ -6,7 +6,7 @@ Fetch error: http://idp.micropolia.com/ => https://idp.micropolia.com/: (60, 'SS
 	(www.)?micropolia.com: 401
 
 -->
-<ruleset name="Micro Polia.com (partial)" platform="cacert" default_off='failed ruleset test'>
+<ruleset name="Micro Polia.com (partial)" default_off='failed ruleset test'>
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/SF-Mail.de.xml b/src/chrome/content/rules/SF-Mail.de.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://webmail.sf-mail.de/ => https://webmail.sf-mail.de/: (60, 'SSL certificate problem: self signed certificate in certificate chain')
 
 -->
-<ruleset name="SF-Mail.de" platform="cacert" default_off='failed ruleset test'>
+<ruleset name="SF-Mail.de" default_off='failed ruleset test'>
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/Someserver.xml b/src/chrome/content/rules/Someserver.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.someserver.de/ => https://www.someserver.de/: (60, 'SSL
 		- CHDK.xml
 
 -->
-<ruleset name="Someserver (partial)" platform="cacert" default_off='failed ruleset test'>
+<ruleset name="Someserver (partial)" default_off='failed ruleset test'>
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/Xiscosoft.es.xml b/src/chrome/content/rules/Xiscosoft.es.xml
@@ -30,7 +30,7 @@
 	* Secured by us, doesn't trip MCB
 
 -->
-<ruleset name="Xiscosoft.es" platform="cacert" default_off="missing certificate chain">
+<ruleset name="Xiscosoft.es" default_off="missing certificate chain">
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/Zugaina-mismatches.xml b/src/chrome/content/rules/Zugaina-mismatches.xml
@@ -2,7 +2,7 @@
 	For other Zugaina coverage, see Zugaina.xml.
 
 -->
-<ruleset name="Zugaina.com (partial)" default_off="mismatched" platform="cacert">
+<ruleset name="Zugaina.com (partial)" default_off="mismatched">
 
 	<target host="zugaina.com" />
 	<target host="www.zugaina.com" />
diff --git a/test/rules/platform_certs/cacert/5ed36f99.0 b/test/rules/platform_certs/cacert/5ed36f99.0
diff --git a/test/rules/platform_certs/cacert/99d0fa06.0 b/test/rules/platform_certs/cacert/99d0fa06.0
diff --git a/test/rules/platform_certs/cacert/cacert_class1_root.pem b/test/rules/platform_certs/cacert/cacert_class1_root.pem
diff --git a/test/validations/relaxng/schema.xml b/test/validations/relaxng/schema.xml
@@ -8,7 +8,7 @@
   <optional>
     <attribute name="platform">
       <data type="string">
-        <param name="pattern">(firefox|chromium|cacert|ipsca|mixedcontent)( (firefox|chromium|cacert|ipsca|mixedcontent))*</param>
+        <param name="pattern">mixedcontent</param>
       </data>
     </attribute>
   </optional>
