Bug 711334 - Be explicit that TLS version is 1.0. r=IanN
authorJens Hatlak <jh@junetz.de>
Tue, 28 Feb 2012 18:48:58 +0100
changeset 7763 13110e9fd02dab3ff06175e0f5e0ddab8c30977e
parent 7762 86504940c721c810ca8d6848bca4a172cd5307a1
child 7764 9324287833954e60a95be8736888e387e9345a85
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersIanN
bugs711334, 711335
Bug 711334 - Be explicit that TLS version is 1.0. r=IanN Also fixes Bug 711335 - Update SSL help after SSL 2.0 removal X-Channel-Repo: comm-central X-Channel-Converted-Revision: c1704e94d670c5668437235b810aa24445be08ae
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/pref/pref-ssl.dtd
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -42,35 +42,35 @@
 <h3 id="ssl_protocol_versions">SSL Protocol Versions</h3>
 
 <p>The Secure Sockets Layer (SSL) protocol defines rules governing mutual
   authentication between a web site and browser software and the encryption of
   information that flows between them. The Transport Layer Security (TLS)
   protocol is an IETF standard based on SSL. TLS 1.0 can be thought of as SSL
   3.1.</p>
 
-<p>You should normally leave these three checkboxes selected to ensure that
-  both older and newer web servers can work with the browser:</p>
+<p>You should normally leave all of the following checkboxes selected to ensure
+  that both older and newer web servers can work with the browser:</p>
 
 <ul>
-  <li><strong>Enable SSL version 3</strong>: Allows newer web servers to work
-    with the browser.</li>
-  <li><strong>Enable TLS</strong>: Allows web servers that support TLS to take
-    advantage of it.</li>
+  <li><strong>Enable SSL 3.0</strong>: Allows web servers that support SSL 3.0
+    to work with the browser.</li>
+  <li><strong>Enable TLS 1.0</strong>: Allows newer web servers that support TLS
+    to take advantage of it.</li>
 </ul>
 
 <p><strong>Important note regarding TLS</strong>: Some servers that do not
   implement SSL correctly cannot negotiate the SSL handshake with client
   software (such as the browser) that supports TLS. Such servers are known as
   <q>TLS intolerant</q>.</p>
 
-<p>When the Enable TLS option in the SSL preferences panel is selected, the
+<p>When the Enable TLS 1.0 option in the SSL preferences panel is selected, the
   browser attempts to use the TLS protocol when making secure connections with
   a server. If that connection fails because the server is TLS intolerant, the
-  browser will fall back to using SSL 3.0.</p>
+  browser will fall back to using SSL 3.0 (if enabled).</p>
 
 <h3 id="ssl_warnings">SSL Warnings</h3>
 
 <p>It&apos;s easy to tell when the web site you are viewing is using an encrypted
   connection. If the connection is encrypted, the lock icon in the lower-right
   corner of the browser window is locked. If the connection is not encrypted,
   the lock icon is unlocked.</p>
 
--- a/suite/chrome/common/pref/pref-ssl.dtd
+++ b/suite/chrome/common/pref/pref-ssl.dtd
@@ -36,20 +36,20 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY  SSLProtocolVersions.caption       "SSL Protocol Versions">
 <!ENTITY  SSLWarnings.caption               "SSL Warnings">
 <!ENTITY  SSLClientAuthMethod.caption       "Client Certificate Selection">
 
 <!ENTITY pref.ssl.title                     "Secure Sockets Layer (SSL)">
-<!ENTITY enable.ssl3                        "Enable SSL version 3">
-<!ENTITY enable.ssl3.accesskey              "3">
-<!ENTITY enable.tls                         "Enable TLS">
-<!ENTITY enable.tls.accesskey               "T">
+<!ENTITY enable.ssl30.label                 "Enable SSL 3.0">
+<!ENTITY enable.ssl30.accesskey             "3">
+<!ENTITY enable.tls10.label                 "Enable TLS 1.0">
+<!ENTITY enable.tls10.accesskey             "T">
 
 <!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">
 <!ENTITY warn.enteringsecure.accesskey      "L">
 <!ENTITY warn.enteringweak                  "Loading a page that uses low-grade encryption">
 <!ENTITY warn.enteringweak.accesskey        "o">
 <!ENTITY warn.insecurepost                  "Sending form data from an unencrypted page to an unencrypted page">
 <!ENTITY warn.insecurepost.accesskey        "S">