Bug 884449 - Update the SSL Preference Pane once TLS 1.2 is implemented and made the default. r=IanN, ui-r=Neil

a=Callek for CLOSED TREE

suite/locales/en-US/chrome/common/help/ssl_help.xhtml

@@ -52,7 +52,7 @@
   protection of sensitive information exchanged with email, calendar, or
   directory servers. The newer Transport Layer Security (TLS) protocol is an
   IETF standard based on SSL but with its own version numbering. TLS 1.0 can
-  be thought of as SSL 3.1, and TLS 1.1 is in turn an update to TLS 1.0. Newer
+  be thought of as SSL 3.1, TLS 1.1 is in turn an update to TLS 1.0, etc. Newer
   protocols are preferred over older ones as they provide better security and
   more features. Older protocols are supported to ensure compatibility.</p>
 
@@ -66,8 +66,9 @@
 
 <ul>
   <li><strong>Enable</strong>: Check the <strong>SSL 3.0</strong>, <strong>TLS
-    1.0</strong>, and/or <strong>TLS 1.1</strong> boxes to indicate which
-    protocol versions can be used for a secure connection to a server.</li>
+    1.0</strong>, <strong>TLS 1.1</strong>, and/or <strong>TLS 1.2</strong>
+    boxes to indicate which protocol versions can be used for a secure
+    connection to a server.</li>
 </ul>
 
 <p><strong>Notes</strong>:</p>
@@ -78,8 +79,8 @@
   <li>Also, the selection must be contiguous. It is not possible to select both
     SSL 3.0 and TLS 1.1 but to exclude the intermediate TLS 1.0 version.</li>
   <li>You can extend the range by multiple versions. For example, if only SSL
-    3.0 is currently checked and you select TLS 1.1, the TLS 1.0 version is
-    automatically selected as well.</li>
+    3.0 is currently checked and you select TLS 1.2, the TLS 1.0 and TLS 1.1
+    versions are automatically selected as well.</li>
   <li>Checkboxes may appear checked but grayed out if you cannot uncheck them
     without violating these rules. Uncheck the outermost boxes to regain
     access to an enclosed intermediate version.</li>

suite/locales/en-US/chrome/common/pref/pref-ssl.dtd

@@ -16,6 +16,8 @@
 <!ENTITY limit.tls10.accesskey              "T">
 <!ENTITY limit.tls11.label                  "TLS 1.1">
 <!ENTITY limit.tls11.accesskey              "1">
+<!ENTITY limit.tls12.label                  "TLS 1.2">
+<!ENTITY limit.tls12.accesskey              "2">
 
 <!ENTITY warn.description                   "&brandShortName; can alert you to the security status of the web page you are viewing. Set &brandShortName; to show a warning and ask permission before:">
 <!ENTITY warn.enteringsecure                "Loading a page that supports encryption">

suite/security/prefs/pref-ssl.js

@@ -4,8 +4,8 @@
 
 function Startup()
 {
-  // array associating XUL element IDs with preference values [0,1,2]
-  gSslPrefElementIds = ["allowSSL30", "allowTLS10", "allowTLS11"];
+  // array associating XUL element IDs with preference values [0,1,2,3]
+  gSslPrefElementIds = ["allowSSL30", "allowTLS10", "allowTLS11", "allowTLS12"];
 
   // initial setting of checkboxes based on preference values
   UpdateSslBoxes();

suite/security/prefs/pref-ssl.xul

@@ -61,17 +61,22 @@
                   class="nogray-disabled"
                   label="&limit.ssl30.label;"
                   accesskey="&limit.ssl30.accesskey;"
-                  oncommand="UpdateSslPrefs()"/>
+                  oncommand="UpdateSslPrefs();"/>
         <checkbox id="allowTLS10"
                   class="nogray-disabled"
                   label="&limit.tls10.label;"
                   accesskey="&limit.tls10.accesskey;"
-                  oncommand="UpdateSslPrefs()"/>
+                  oncommand="UpdateSslPrefs();"/>
         <checkbox id="allowTLS11"
                   class="nogray-disabled"
                   label="&limit.tls11.label;"
                   accesskey="&limit.tls11.accesskey;"
-                  oncommand="UpdateSslPrefs()"/>
+                  oncommand="UpdateSslPrefs();"/>
+        <checkbox id="allowTLS12"
+                  class="nogray-disabled"
+                  label="&limit.tls12.label;"
+                  accesskey="&limit.tls12.accesskey;"
+                  oncommand="UpdateSslPrefs();"/>
       </hbox>
 
     </groupbox>