2
0
mirror of https://github.com/mozilla/cipherscan.git synced 2024-11-22 14:23:41 +01:00

correctly count broken cipher suites with "no reporting of untrusted"

This commit is contained in:
Hubert Kario 2014-06-04 18:17:02 +02:00
parent 86ff1122cc
commit 3667b04ad7

View File

@ -32,6 +32,7 @@ for r,d,flist in os.walk(path):
tempdsakeystats = {} tempdsakeystats = {}
tempsigstats = {} tempsigstats = {}
tempticketstats = {} tempticketstats = {}
tempcipherstats = {}
ciphertypes = 0 ciphertypes = 0
AESGCM = False AESGCM = False
AES = 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']: if 'ADH' in entry['cipher'] or 'AECDH' in entry['cipher']:
ciphertypes += 1 ciphertypes += 1
name = "z:" + entry['cipher'] name = "z:" + entry['cipher']
cipherstats[name] += 1 tempcipherstats[name] = 1
elif 'AES128-GCM' in entry['cipher'] or 'AES256-GCM' in entry['cipher']: elif 'AES128-GCM' in entry['cipher'] or 'AES256-GCM' in entry['cipher']:
if not AESGCM: if not AESGCM:
AESGCM = True AESGCM = True
@ -106,7 +107,7 @@ for r,d,flist in os.walk(path):
else: else:
ciphertypes += 1 ciphertypes += 1
name = "z:" + entry['cipher'] name = "z:" + entry['cipher']
cipherstats[name] += 1 tempcipherstats[name] = 1
""" store key handshake methods """ """ store key handshake methods """
if 'ECDHE' in entry['cipher']: 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 forced in TLS1.1+'] += 1
cipherstats['RC4 Preferred'] += 1 cipherstats['RC4 Preferred'] += 1
for cipher in tempcipherstats:
cipherstats[cipher] += 1
""" store handshake stats """ """ store handshake stats """
if ECDHE: if ECDHE: