[tor-commits] [torbirdy/master] Remove redundant security settings

[sukhbir at torproject.org]

commit 776e7cb2700c7cc5f2416ff1036684ea7e605665
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Thu May 19 09:23:12 2016 -0400

    Remove redundant security settings
    
    We have supported servers that do not support secure renegotiation but that
    was a long time ago when some servers didn't support it. This setting should
    no longer be required.
---
 chrome/content/preferences.js  | 19 +------------------
 chrome/content/preferences.xul | 10 ----------
 chrome/locale/en/torbirdy.dtd  |  3 ---
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index f1bf091..682b367 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -45,6 +45,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
     if (anonService === "jondo") {
       proxy = "http://127.0.0.1:4001";
     }
+
     return opts +
            "--no-emit-version " +
            "--no-comments " +
@@ -363,18 +364,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
       pub.prefs.setBoolPref(pub.prefBranch + 'emailwizard', false);
     }
 
-    // Insecure renegotiation - default: false (opt-out for mailservers that do
-    // not support secure renegotiation yet)
-    var securityRenegotiation = 'security.ssl.require_safe_negotiation';
-    var securityWarn = 'security.ssl.treat_unsafe_negotiation_as_broken';
-    if (pub.secureRenegotiation.checked) {
-      pub.setPreferences(securityRenegotiation, false);
-      pub.setPreferences(securityWarn, false);
-    } else {
-      pub.clearSinglePref(securityRenegotiation);
-      pub.clearSinglePref(securityWarn);
-    }
-
     if (index === 1) {
       // JonDo.
       if (pub.anonCustomService.selectedIndex === 0) {
@@ -535,12 +524,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
     /*
      Security
     */
-    // Allow insecure renegotiation - default: false
-    if (pub.prefs.prefHasUserValue(pub.customBranch + 'security.ssl.require_safe_negotiation')) {
-      pub.secureRenegotiation.checked = true;
-    } else {
-      pub.secureRenegotiation.checked = false;
-    }
 
     // Load the email accounts.
     var accounts = pub.getAccount();
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 2526f4d..8db7230 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -28,7 +28,6 @@
       <tab label="&torbirdy.prefs.proxy.label;"/>
       <tab label="&torbirdy.prefs.privacy.label;"/>
       <tab label="&torbirdy.prefs.enigmail.label;"/>
-      <tab label="&torbirdy.prefs.security.label;"/>
     </tabs>
 
     <tabpanels>
@@ -148,15 +147,6 @@
       </tabpanel>
 
       <!-- Security Settings -->
-      <tabpanel>
-        <vbox>
-
-          <vbox>
-              <checkbox accesskey="&torbirdy.prefs.renegotiation.key;" id="torbirdy-renegotiation" label="&torbirdy.prefs.renegotiation.label;"/>
-          </vbox>
-
-        </vbox>
-      </tabpanel>
 
     </tabpanels>
 
diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd
index d670135..26d357e 100644
--- a/chrome/locale/en/torbirdy.dtd
+++ b/chrome/locale/en/torbirdy.dtd
@@ -19,7 +19,6 @@
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Privacy">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
-<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
@@ -45,8 +44,6 @@
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
 <!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.automatic.key "f">
-<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
-<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">