diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
index 40a7d980ea98..c7328f68f5cb 100644
--- a/src/chrome/content/code/HTTPS.js
+++ b/src/chrome/content/code/HTTPS.js
@@ -264,8 +264,6 @@ const HTTPS = {
cookiesCleanup: function(refCookie) {
- var downgraded = [];
-
var ignored = this.secureCookiesExceptions;
var disabled = !this.secureCookies;
var bi = DOM.createBrowserIterator();
diff --git a/utils/downgrade-whitelist.txt b/utils/downgrade-whitelist.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/utils/relaxng.xml b/utils/relaxng.xml
index d065cf0121e6..181d021d76e8 100644
--- a/utils/relaxng.xml
+++ b/utils/relaxng.xml
@@ -75,9 +75,6 @@
(https?://[^ \\]*/[^ \\]*|https:)
-
-
-
diff --git a/utils/simple.py b/utils/simple.py
index 76aa3477873e..f5f4ebba647c 100644
--- a/utils/simple.py
+++ b/utils/simple.py
@@ -27,8 +27,6 @@ def simple(f):
not tree.xpath("/ruleset/exclusion"),
# targets must not contain any wildcards
not any("*" in target for target in targets),
- # ruleset must not contain any downgrade rules
- not any("downgrade" in rule.attrib for rule in tree.xpath("/ruleset/rule")),
# and every rule must itself be simple according to the criteria below
all(simple_rule(rule, targets) for rule in tree.xpath("/ruleset/rule"))
])
diff --git a/utils/single_rule_response.py b/utils/single_rule_response.py
index 16fc9d66d471..c98ce7a6a7fc 100755
--- a/utils/single_rule_response.py
+++ b/utils/single_rule_response.py
@@ -89,8 +89,6 @@ def find_redirect(to):
seen = []
for rule in tree.xpath('/ruleset/rule'):
to = rule.get('to')
- if rule.get('downgrade') or to in seen:
- continue
if back_ref.search(to):
continue
if not test_response_no_redirect(to):
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
index 563d589918a6..87863896a721 100755
--- a/utils/trivial-validate.py
+++ b/utils/trivial-validate.py
@@ -32,10 +32,8 @@ def fail(s):
xpath_cookie_host_pattern = etree.XPath("/ruleset/securecookie/@host")
xpath_cookie_name_pattern = etree.XPath("/ruleset/securecookie/@name")
-# Load lists of ruleset names whitelisted for downgrade & duplicate rules
+# Load lists of ruleset names whitelisted for duplicate rules
thispath = os.path.dirname(os.path.realpath(__file__))
-with open(thispath + '/downgrade-whitelist.txt') as downgrade_fh:
- downgrade_allowed_list = [x.rstrip('\n') for x in downgrade_fh.readlines()]
with open(thispath + '/duplicate-whitelist.txt') as duplicate_fh:
duplicate_allowed_list = [x.rstrip('\n') for x in duplicate_fh.readlines()]
@@ -96,21 +94,10 @@ def test_unencrypted_to(tree, rulename, from_attrib, to):
# Rules that redirect to something other than https or http.
# This used to test for http: but testing for lack of https: will
# catch more kinds of mistakes.
- # Now warn if the rule author indicates they intended it, with the
- # downgrade attribute. Error if this attribute is not present.
"""Rule redirects to something other than https."""
for rule in xpath_rule(tree):
- to, downgrade = rule.get("to"), rule.get("downgrade")
- if to[:6] != "https:" and to[:5] != "http:":
- return False
- elif to[:5] == "http:" and downgrade:
- if rulename in downgrade_allowed_list:
- warn("whitelisted downgrade rule in %s redirects to http." % rulename)
- else:
- fail("non-whitelisted downgrade rule in %s redirects to http." % rulename)
- return False
- elif to[:5] == "http:":
- fail("non-downgrade rule in %s redirects to http." % rulename)
+ to = rule.get("to")
+ if to[:6] != "https:":
return False
return True