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

diff --git a/symm/salsa20-poly1305.c b/symm/salsa20-poly1305.c
index bfee0bac..201a0832 100644
--- a/symm/salsa20-poly1305.c
+++ b/symm/salsa20-poly1305.c
@@ -44,19 +44,31 @@ LATINPOLY_DEF(salsa208, salsa20, "salsa20/8")
 #include <mLib/testrig.h>
 #include "latinpoly-test.h"
 
-static int check_salsa20(dstr *v)
+static int check_salsa20_poly1305(dstr *v)
   { return latinpoly_test(&salsa20_poly1305, v); }
-static int check_salsa2012(dstr *v)
+static int check_salsa2012_poly1305(dstr *v)
   { return latinpoly_test(&salsa2012_poly1305, v); }
-static int check_salsa208(dstr *v)
+static int check_salsa208_poly1305(dstr *v)
   { return latinpoly_test(&salsa208_poly1305, v); }
+static int check_salsa20_naclbox(dstr *v)
+  { return latinpoly_test(&salsa20_naclbox, v); }
+static int check_salsa2012_naclbox(dstr *v)
+  { return latinpoly_test(&salsa2012_naclbox, v); }
+static int check_salsa208_naclbox(dstr *v)
+  { return latinpoly_test(&salsa208_naclbox, v); }
 
 static const test_chunk tests[] = {
-  { "salsa20-poly1305", check_salsa20,
+  { "salsa20-poly1305", check_salsa20_poly1305,
     { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
-  { "salsa20/12-poly1305", check_salsa2012,
+  { "salsa20/12-poly1305", check_salsa2012_poly1305,
     { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
-  { "salsa20/8-poly1305", check_salsa208,
+  { "salsa20/8-poly1305", check_salsa208_poly1305,
+    { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
+  { "salsa20-naclbox", check_salsa20_naclbox,
+    { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
+  { "salsa20/12-naclbox", check_salsa2012_naclbox,
+    { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
+  { "salsa20/8-nacblox", check_salsa208_naclbox,
     { &type_hex, &type_hex, &type_hex, &type_hex, &type_hex, &type_hex } },
   { 0, 0, { 0 } }
 #undef TEST