Bug 1508673 - Added ChachaPoly testcases from Wycheproof, r=franziskus

Summary:
Adapted chacha20_poly1305 unittests to wycheproof testcases.
Extended test vector header generation script to include chacha.

Depends on D12559.

Reviewers: franziskus

Subscribers: jcj

Bug #: 1508673

Differential Revision: https://phabricator.services.mozilla.com/D13798

1 files changed, 3 insertions, 3 deletions

diff --git a/mach b/mach
index 46b3ad7b1..49af1b90b 100755
--- a/mach
+++ b/mach
@@ -17,7 +17,7 @@ import platform
 import tempfile
 
 from hashlib import sha256
-from gtests.common.wycheproof.genaesgcm import generate_aes_gcm
+from gtests.common.wycheproof.genTestVectors import generate_test_vectors
 
 DEVNULL = open(os.devnull, 'wb')
 cwd = os.path.dirname(os.path.abspath(__file__))
@@ -214,11 +214,11 @@ class commandsAction(argparse.Action):
             print(c)
 
 class wycheproofAction(argparse.Action):
-    tests = ['aes_gcm_test.json']
+    tests = ['aes_gcm_test.json', 'chacha20_poly1305_test.json']
 
     def __call__(self, parser, args, values, option_string=None):
         self.update_tests()
-        generate_aes_gcm()
+        generate_test_vectors()
         clangFormat = cfAction(None, None, None)
         clangFormat(None, args, None)