X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/aac19f0d10e3e1a41ddb5ca3fdbdaab97d2d439d..e275090f9f712a8d9dda4e309ce38bb520778016:/symm/chacha-poly1305.c

diff --git a/symm/chacha-poly1305.c b/symm/chacha-poly1305.c
index c2866353..657987ee 100644
--- a/symm/chacha-poly1305.c
+++ b/symm/chacha-poly1305.c
@@ -44,19 +44,31 @@ LATINPOLY_DEF(chacha8, chacha, "chacha8")
 #include <mLib/testrig.h>
 #include "latinpoly-test.h"
 
-static int check_chacha20(dstr *v)
+static int check_chacha20_poly1305(dstr *v)
   { return latinpoly_test(&chacha20_poly1305, v); }
-static int check_chacha12(dstr *v)
+static int check_chacha12_poly1305(dstr *v)
   { return latinpoly_test(&chacha12_poly1305, v); }
-static int check_chacha8(dstr *v)
+static int check_chacha8_poly1305(dstr *v)
   { return latinpoly_test(&chacha8_poly1305, v); }
+static int check_chacha20_naclbox(dstr *v)
+  { return latinpoly_test(&chacha20_naclbox, v); }
+static int check_chacha12_naclbox(dstr *v)
+  { return latinpoly_test(&chacha12_naclbox, v); }
+static int check_chacha8_naclbox(dstr *v)
+  { return latinpoly_test(&chacha8_naclbox, v); }
 
 static const test_chunk tests[] = {
-  { "chacha20-poly1305", check_chacha20,
+  { "chacha20-poly1305", check_chacha20_poly1305,
     { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
-  { "chacha12-poly1305", check_chacha12,
+  { "chacha12-poly1305", check_chacha12_poly1305,
     { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
-  { "chacha8-poly1305", check_chacha8,
+  { "chacha8-poly1305", check_chacha8_poly1305,
+    { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
+  { "chacha20-naclbox", check_chacha20_naclbox,
+    { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
+  { "chacha12-naclbox", check_chacha12_naclbox,
+    { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
+  { "chacha8-naclbox", check_chacha8_naclbox,
     { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
   { 0, 0, { 0 } }
 #undef TEST