From be0439ef99f976c8ae3e6fdaba7b3b33f0e23a8c Mon Sep 17 00:00:00 2001
From: Hubert Kario <hkario@redhat.com>
Date: Wed, 4 Jun 2014 18:17:41 +0200
Subject: [PATCH] provide statistics for all key exchange methods, not DHE and
 ECDHE only

---
 top1m/parse_results.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/top1m/parse_results.py b/top1m/parse_results.py
index bb4ab63..014273d 100644
--- a/top1m/parse_results.py
+++ b/top1m/parse_results.py
@@ -40,9 +40,13 @@ for r,d,flist in os.walk(path):
         DES3 = False
         CAMELLIA = False
         RC4 = False
+        ADH = False
         DHE = False
+        AECDH = False
         ECDHE = False
         RSA = False
+        ECDH = False
+        DH = False
         SSL2 = False
         SSL3 = False
         TLS1 = False
@@ -113,9 +117,19 @@ for r,d,flist in os.walk(path):
                 if 'ECDHE' in entry['cipher']:
                     ECDHE = True
                     temppfsstats[entry['pfs']] = 1
-                elif 'DHE' in entry['cipher']:
+                elif 'DHE' in entry['cipher'] or 'EDH' in entry['cipher']:
                     DHE = True
                     temppfsstats[entry['pfs']] = 1
+                elif 'AECDH' in entry['cipher']:
+                    AECDH = True
+                elif 'ADH' in entry['cipher']:
+                    ADH = True
+                elif 'ECDH' in entry['cipher']:
+                    ECDH = True
+                elif 'DH' in entry['cipher']:
+                    DH = True
+                else:
+                    RSA = True
 
                 """ save the key size """
                 if 'ECDSA' in entry['cipher']:
@@ -236,10 +250,18 @@ for r,d,flist in os.walk(path):
             cipherstats[cipher] += 1
 
         """ store handshake stats """
+        if AECDH:
+            handshakestats['AECDH'] += 1
+        if ADH:
+            handshakestats['ADH'] += 1
         if ECDHE:
             handshakestats['ECDHE'] += 1
         if DHE:
             handshakestats['DHE'] += 1
+        if ECDH:
+            handshakestats['ECDH'] += 1
+        if DH:
+            handshakestats['DH'] += 1
         if RSA:
             handshakestats['RSA'] += 1