Work-around tls1.3 new cipher suite string key exchange, auth algorit…

…hms detection #77
sibiantony · Dec 4, 2016 · 092f4db · 092f4db
1 parent 53dd4f0
commit 092f4db
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/modules/cipher-suites.js b/modules/cipher-suites.js
@@ -61,6 +61,24 @@ const ciphersuites = {
             ui: 'RSA EXPORT',
             notes: ''
         },
+
+        // Workaround for TLS 1.3 draft cipher suite strings.
+        // Mozilla doesn't yet expose the key exchange in SSLStatus
+        {
+            name: 'TLS_AES',
+            rank: 10,
+            pfs: 1,
+            ui: 'Unknown',
+            notes: 'TLS 1.3'
+        },
+        {
+            name: 'TLS_CHACHA20',
+            rank: 10,
+            pfs: 1,
+            ui: 'Unknown',
+            notes: 'TLS 1.3'
+        },
+
         {
             name: '',
             rank: 0,
@@ -100,6 +118,26 @@ const ciphersuites = {
             cert: 'DSA',
             notes: ''
         },
+
+        // Workaround for TLS 1.3 draft cipher suite strings.
+        // Mozilla doesn't yet expose the authentication in SSLStatus
+        {
+            name: 'TLS_AES',
+            rank: 10,
+            minSecureKeyLength: 0,
+            ui: 'Unknown',
+            cert: '',
+            notes: 'TLS 1.3'
+        },
+        {
+            name: 'TLS_CHACHA20',
+            rank: 10,
+            minSecureKeyLength: 0,
+            ui: 'Unknown',
+            cert: '',
+            notes: 'TLS 1.3'
+        },
+
         {
             name: '',
             rank: 0,

diff --git a/modules/ssleuth-ui.js b/modules/ssleuth-ui.js
@@ -477,8 +477,13 @@ function showCipherDetails(cipherSuite, win) {
 
     doc.getElementById('ssleuth-text-cipher-suite-kxchange').textContent =
         (cipherSuite.keyExchange.ui + '.');
+    doc.getElementById('ssleuth-text-cipher-suite-kxchange-notes').textContent =
+        utils.getText(cipherSuite.keyExchange.notes);
+
     doc.getElementById('ssleuth-text-cipher-suite-auth').textContent =
         (cipherSuite.authentication.ui + '. ');
+    doc.getElementById('ssleuth-text-cipher-suite-auth-notes').textContent =
+        utils.getText(cipherSuite.authentication.notes);
 
     doc.getElementById('ssleuth-text-cipher-suite-bulkcipher').textContent =
         (cipherSuite.bulkCipher.ui + ' ' + cipherSuite.cipherKeyLen +