Bug 1250568 - Adding TLS 1.3 to nsISSLStatus, r?keeler draft
authorMartin Thomson <martin.thomson@gmail.com>
Sat, 02 Apr 2016 20:51:54 -0300
changeset 347181 5a3e8b9b904f3d5a84a6f2e63906eedb08ee7722
parent 347180 2adaa2ec995af11d9454663a028e6eb75a5a4212
child 517564 e9e80797019ea67a0b43c041d7fcb1392001970c
push id14509
push usermartin.thomson@gmail.com
push dateSun, 03 Apr 2016 00:03:25 +0000
reviewerskeeler
bugs1250568
milestone48.0a1
Bug 1250568 - Adding TLS 1.3 to nsISSLStatus, r?keeler MozReview-Commit-ID: 2rLXAa2ZRdq
browser/base/content/pageinfo/security.js
devtools/shared/webconsole/network-helper.js
security/manager/ssl/nsISSLStatus.idl
--- a/browser/base/content/pageinfo/security.js
+++ b/browser/base/content/pageinfo/security.js
@@ -85,16 +85,19 @@ var security = {
           retval.version = "TLS 1.0";
           break;
         case nsISSLStatus.TLS_VERSION_1_1:
           retval.version = "TLS 1.1";
           break;
         case nsISSLStatus.TLS_VERSION_1_2:
           retval.version = "TLS 1.2"
           break;
+        case nsISSLStatus.TLS_VERSION_1_3:
+          retval.version = "TLS 1.3"
+          break;
       }
 
       return retval;
     } else {
       return {
         hostName : hostName,
         cAName : "",
         encryptionAlgorithm : "",
--- a/devtools/shared/webconsole/network-helper.js
+++ b/devtools/shared/webconsole/network-helper.js
@@ -716,16 +716,18 @@ var NetworkHelper = {
   formatSecurityProtocol: function(version) {
     switch (version) {
       case Ci.nsISSLStatus.TLS_VERSION_1:
         return "TLSv1";
       case Ci.nsISSLStatus.TLS_VERSION_1_1:
         return "TLSv1.1";
       case Ci.nsISSLStatus.TLS_VERSION_1_2:
         return "TLSv1.2";
+      case Ci.nsISSLStatus.TLS_VERSION_1_3:
+        return "TLSv1.3";
       default:
         DevToolsUtils.reportException("NetworkHelper.formatSecurityProtocol",
           "protocolVersion " + version + " is unknown.");
         return "Unknown";
     }
   },
 
   /**
--- a/security/manager/ssl/nsISSLStatus.idl
+++ b/security/manager/ssl/nsISSLStatus.idl
@@ -15,16 +15,17 @@ interface nsISSLStatus : nsISupports {
   readonly attribute ACString cipherName;
   readonly attribute unsigned long keyLength;
   readonly attribute unsigned long secretKeyLength;
 
   const short SSL_VERSION_3   = 0;
   const short TLS_VERSION_1   = 1;
   const short TLS_VERSION_1_1 = 2;
   const short TLS_VERSION_1_2 = 3;
+  const short TLS_VERSION_1_3 = 4;
   readonly attribute unsigned short protocolVersion;
 
   readonly attribute boolean isDomainMismatch;
   readonly attribute boolean isNotValidAtThisTime;
 
   /* Note: To distinguish between
    *         "unstrusted because missing or untrusted issuer"
    *       and