Bug 1113780 - Use SSL_ERROR_UNSUPPORTED_VERSION for SSLv3 error page. r=gijs, a=sylvestre (see bug 1098371)
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Fri, 09 Jan 2015 06:23:00 +0000
changeset 243034 ea3b10634381
parent 243033 e6cefc687439
child 243035 a160dd7b5dda
push id4369
push usergijskruitbosch@gmail.com
push date2015-01-26 15:41 +0000
treeherdermozilla-beta@ea3b10634381 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs, sylvestre
bugs1113780, 1098371
milestone36.0
Bug 1113780 - Use SSL_ERROR_UNSUPPORTED_VERSION for SSLv3 error page. r=gijs, a=sylvestre (see bug 1098371)
browser/base/content/aboutNetError.xhtml
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -152,33 +152,33 @@
         if (ld)
         {
           ld.parentNode.replaceChild(errDesc, ld);
           // change id to the replaced child's id so styling works
           errDesc.id = "errorLongDesc";
         }
 
         if (err == "nssFailure2" &&
-            sd.textContent.contains("ssl_error_no_cypher_overlap")) {
+            sd.textContent.contains("ssl_error_unsupported_version")) {
           var ssl3ErrorTitle = document.getElementById("et_ssl3");
           var ssl3ErrorDesc = document.getElementById("ed_ssl3");
           var ssl3ShortDesc = document.getElementById("esd_ssl3");
           var learnMoreText = document.getElementById("learn_more_ssl3");
 
           errTitle.parentNode.replaceChild(ssl3ErrorTitle, errTitle);
           ssl3ErrorTitle.id = "errorTitleText";
           ssl3ErrorTitle.setAttribute("sslv3", "true");
           errTitle = ssl3ErrorTitle;
 
           sd.innerHTML = ssl3ShortDesc.innerHTML;
           sd.querySelector('span').textContent = location.hostname;
 
           errDesc.parentNode.replaceChild(ssl3ErrorDesc, errDesc);
           ssl3ErrorDesc.id = "errorLongDesc";
-          ssl3ErrorDesc.querySelector('span').textContent = "ssl_error_no_cypher_overlap";
+          ssl3ErrorDesc.querySelector('span').textContent = "ssl_error_unsupported_version";
 
           var retryBtn = document.getElementById("errorTryAgain");
           retryBtn.textContent = learnMoreText.textContent;
           retryBtn.setAttribute("onclick", "learnMoreSSLV3()");
         }
 
         // remove undisplayed errors to avoid bug 39098
         var errContainer = document.getElementById("errorContainer");