From 3667b04ad7dff410ece639730e8b3d4381c1dcf9 Mon Sep 17 00:00:00 2001
From: Hubert Kario <hkario@redhat.com>
Date: Wed, 4 Jun 2014 18:17:02 +0200
Subject: [PATCH] correctly count broken cipher suites with "no reporting of
 untrusted"

---
 top1m/parse_results.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/top1m/parse_results.py b/top1m/parse_results.py
index 035de09..bb4ab63 100644
--- a/top1m/parse_results.py
+++ b/top1m/parse_results.py
@@ -32,6 +32,7 @@ for r,d,flist in os.walk(path):
         tempdsakeystats = {}
         tempsigstats = {}
         tempticketstats = {}
+        tempcipherstats = {}
         ciphertypes = 0
         AESGCM = False
         AES = False
@@ -78,7 +79,7 @@ for r,d,flist in os.walk(path):
                 if 'ADH' in entry['cipher'] or 'AECDH' in entry['cipher']:
                     ciphertypes += 1
                     name = "z:" + entry['cipher']
-                    cipherstats[name] += 1
+                    tempcipherstats[name] = 1
                 elif 'AES128-GCM' in entry['cipher'] or 'AES256-GCM' in entry['cipher']:
                     if not AESGCM:
                         AESGCM = True
@@ -106,7 +107,7 @@ for r,d,flist in os.walk(path):
                 else:
                     ciphertypes += 1
                     name = "z:" + entry['cipher']
-                    cipherstats[name] += 1
+                    tempcipherstats[name] = 1
 
                 """ store key handshake methods """
                 if 'ECDHE' in entry['cipher']:
@@ -231,6 +232,8 @@ for r,d,flist in os.walk(path):
                         cipherstats['RC4 forced in TLS1.1+'] += 1
                 cipherstats['RC4 Preferred'] += 1
 
+        for cipher in tempcipherstats:
+            cipherstats[cipher] += 1
 
         """ store handshake stats """
         if ECDHE: