From 4a6ff56b8155877d17127e1f24f7fe43729a6bea Mon Sep 17 00:00:00 2001 From: Julien Vehent Date: Thu, 2 Apr 2015 04:39:59 -0400 Subject: [PATCH] Add back support for old curve json format in parse results --- top1m/parse_results.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/top1m/parse_results.py b/top1m/parse_results.py index fa9fb85..6c5326a 100644 --- a/top1m/parse_results.py +++ b/top1m/parse_results.py @@ -147,10 +147,21 @@ for r,d,flist in os.walk(path): if len(results['ciphersuite']) < 1: continue - """ save ECC fallback """ + """ save ECC fallback (new format) """ if 'curves_fallback' in results: tempeccfallback = results['curves_fallback'] + """ save ECC curve stats (old format) """ + if 'curve_fallback' in results: + tempeccfallback = results['curve_fallback'] + if 'curve_ordering' in results: + tempeccordering = results['curve_ordering'] + if 'curve' in results: + for curve in results['curve']: + tempecccurve[curve] = 1 + if len(results['curve']) == 1: + tempecccurve[curve + ' Only'] = 1 + """ loop over list of ciphers """ for entry in results['ciphersuite']: