From b2edb0e36141c5d7770678e2fc098b52696ca47c Mon Sep 17 00:00:00 2001
From: Hubert Kario <hkario@redhat.com>
Date: Sun, 6 Apr 2014 14:11:52 +0200
Subject: [PATCH] add support for Chacha20 based ciphers

Basically all Google servers support Chacha20 now and it is
not a bad choice, so report it as a regular cipher
---
 top1m/parse_results.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/top1m/parse_results.py b/top1m/parse_results.py
index d9029fb..2f6adc9 100644
--- a/top1m/parse_results.py
+++ b/top1m/parse_results.py
@@ -32,6 +32,7 @@ for r,d,flist in os.walk(path):
         ciphertypes = 0
         AESGCM = False
         AES = False
+        CHACHA20 = False
         DES3 = False
         CAMELLIA = False
         RC4 = False
@@ -90,6 +91,10 @@ for r,d,flist in os.walk(path):
                     if not RC4:
                         ciphertypes += 1
                         RC4 = True
+                elif 'CHACHA20' in entry['cipher']:
+                    if not CHACHA20:
+                        ciphertypes += 1
+                        CHACHA20 = True
                 else:
                     ciphertypes += 1
                     name = "z:" + entry['cipher']
@@ -175,6 +180,10 @@ for r,d,flist in os.walk(path):
         if (AES and ciphertypes == 1) or (AESGCM and ciphertypes == 1)\
             or (AES and AESGCM and ciphertypes == 2):
                 cipherstats['AES Only'] += 1
+        if CHACHA20:
+            cipherstats['CHACHA20'] += 1
+            if ciphertypes == 1:
+                cipherstats['CHACHA20 Only'] += 1
         if DES3:
             cipherstats['3DES'] += 1
             if ciphertypes == 1: