Add a test for HChaCha20

.gitignore

@@ -138,5 +138,6 @@ test/default/stream2
 test/default/stream3
 test/default/stream4
 test/default/verify1
+test/default/xchacha20
 test/js.done
 testing

test/default/Makefile.am

@@ -62,7 +62,8 @@ EXTRA_DIST = \
 	stream2.exp \
 	stream3.exp \
 	stream4.exp \
-	verify1.exp
+	verify1.exp \
+	xchacha20.exp
 
 DISTCLEANFILES = \
 	aead_aes256gcm.res \
@@ -124,7 +125,8 @@ DISTCLEANFILES = \
 	stream2.res \
 	stream3.res \
 	stream4.res \
-	verify1.res
+	verify1.res \
+	xchacha20.res
 
 if NATIVECLIENT
 CLEANFILES = \
@@ -243,7 +245,8 @@ CLEANFILES = \
 	stream2.nexe \
 	stream3.nexe \
 	stream4.nexe \
-	verify1.nexe
+	verify1.nexe \
+	xchacha20.nexe
 endif
 
 AM_CPPFLAGS = \
@@ -507,6 +510,14 @@ stream4_LDADD             = $(TESTS_LDADD)
 verify1_SOURCE            = cmptest.h verify1.c
 verify1_LDADD             = $(TESTS_LDADD)
 
+xchacha20_SOURCE          = cmptest.h xchacha20.c
+xchacha20_LDADD           = $(TESTS_LDADD)
+
+if !MINIMAL
+TESTS_TARGETS += \
+	xchacha20
+endif
+
 if NATIVECLIENT
 LOG_COMPILER = ./nacl-test-wrapper.sh
 endif

test/default/xchacha20.c

@@ -0,0 +1,75 @@
+
+#define TEST_NAME "xchacha20"
+#include "cmptest.h"
+
+typedef struct HChaCha20TV_ {
+    const char key[crypto_core_hchacha20_KEYBYTES * 2 + 1];
+    const char in[crypto_core_hchacha20_INPUTBYTES * 2 + 1];
+    const char out[crypto_core_hchacha20_OUTPUTBYTES * 2 + 1];
+} HChaCha20TV;
+
+static void
+tv_hchacha20(void)
+{
+    const static HChaCha20TV tvs[] = {
+        { "24f11cce8a1b3d61e441561a696c1c1b7e173d084fd4812425435a8896a013dc", "d9660c5900ae19ddad28d6e06e45fe5e", "5966b3eec3bff1189f831f06afe4d4e3be97fa9235ec8c20d08acfbbb4e851e3" },
+        { "80a5f6272031e18bb9bcd84f3385da65e7731b7039f13f5e3d475364cd4d42f7", "c0eccc384b44c88e92c57eb2d5ca4dfa", "6ed11741f724009a640a44fce7320954c46e18e0d7ae063bdbc8d7cf372709df" },
+        { "cb1fc686c0eec11a89438b6f4013bf110e7171dace3297f3a657a309b3199629", "fcd49b93e5f8f299227e64d40dc864a3", "84b7e96937a1a0a406bb7162eeaad34308d49de60fd2f7ec9dc6a79cbab2ca34" },
+        { "6640f4d80af5496ca1bc2cfff1fefbe99638dbceaabd7d0ade118999d45f053d", "31f59ceeeafdbfe8cae7914caeba90d6", "9af4697d2f5574a44834a2c2ae1a0505af9f5d869dbe381a994a18eb374c36a0" },
+        { "0693ff36d971225a44ac92c092c60b399e672e4cc5aafd5e31426f123787ac27", "3a6293da061da405db45be1731d5fc4d", "f87b38609142c01095bfc425573bb3c698f9ae866b7e4216840b9c4caf3b0865" },
+        { "809539bd2639a23bf83578700f055f313561c7785a4a19fc9114086915eee551", "780c65d6a3318e479c02141d3f0b3918", "902ea8ce4680c09395ce71874d242f84274243a156938aaa2dd37ac5be382b42" },
+        { "1a170ddf25a4fd69b648926e6d794e73408805835c64b2c70efddd8cd1c56ce0", "05dbee10de87eb0c5acb2b66ebbe67d3", "a4e20b634c77d7db908d387b48ec2b370059db916e8ea7716dc07238532d5981" },
+        { "3b354e4bb69b5b4a1126f509e84cad49f18c9f5f29f0be0c821316a6986e15a6", "d8a89af02f4b8b2901d8321796388b6c", "9816cb1a5b61993735a4b161b51ed2265b696e7ded5309c229a5a99f53534fbc" },
+        { "4b9a818892e15a530db50dd2832e95ee192e5ed6afffb408bd624a0c4e12a081", "a9079c551de70501be0286d1bc78b045", "ebc5224cf41ea97473683b6c2f38a084bf6e1feaaeff62676db59d5b719d999b" },
+        { "c49758f00003714c38f1d4972bde57ee8271f543b91e07ebce56b554eb7fa6a7", "31f0204e10cf4f2035f9e62bb5ba7303", "0dd8cc400f702d2c06ed920be52048a287076b86480ae273c6d568a2e9e7518c" }
+    };
+    const HChaCha20TV *tv;
+    unsigned char     *constant;
+    unsigned char     *key;
+    unsigned char     *in;
+    unsigned char     *out;
+    unsigned char     *out2;
+    int                i;
+
+    constant = sodium_malloc(crypto_core_hchacha20_CONSTBYTES);
+    key = sodium_malloc(crypto_core_hchacha20_KEYBYTES);
+    in = sodium_malloc(crypto_core_hchacha20_INPUTBYTES);
+    out = sodium_malloc(crypto_core_hchacha20_OUTPUTBYTES);
+    out2 = sodium_malloc(crypto_core_hchacha20_OUTPUTBYTES);
+    for (i = 0; i < (sizeof tv) / (sizeof tv[0]) + 10; i++) {
+        tv = &tvs[i];
+        sodium_hex2bin(key, crypto_core_hchacha20_KEYBYTES,
+                       tv->key, strlen(tv->key), NULL, NULL, NULL);
+        sodium_hex2bin(in, crypto_core_hchacha20_INPUTBYTES,
+                       tv->in, strlen(tv->in), NULL, NULL, NULL);
+        sodium_hex2bin(out, crypto_core_hchacha20_OUTPUTBYTES,
+                       tv->out, strlen(tv->out), NULL, NULL, NULL);
+        assert(crypto_core_hchacha20(out2, in, key, NULL) == 0);
+        assert(memcmp(out, out2, crypto_core_hchacha20_OUTPUTBYTES) == 0);
+    }
+
+    sodium_hex2bin(constant, crypto_core_hchacha20_CONSTBYTES,
+                   "0d29b795c1ca70c1652e823364d32417",
+                   crypto_core_hchacha20_CONSTBYTES * 2 + 1, NULL, NULL, NULL);
+    sodium_hex2bin(out, crypto_core_hchacha20_OUTPUTBYTES,
+                   "934d941d78eb9bfc2f0376f7ccd4a11ecf0c6a44104618a9749ef47fe97037a2",
+                   crypto_core_hchacha20_OUTPUTBYTES * 2 + 1, NULL, NULL, NULL);
+    tv = &tvs[0];
+    crypto_core_hchacha20(out2, in, key, constant);
+    assert(memcmp(out, out2, crypto_core_hchacha20_OUTPUTBYTES) == 0);
+
+    sodium_free(out2);
+    sodium_free(out);
+    sodium_free(in);
+    sodium_free(key);
+    sodium_free(constant);
+    printf("tv_hchacha20: ok\n");
+}
+
+int
+main(void)
+{
+    tv_hchacha20();
+
+    return 0;
+}

test/default/xchacha20.exp

@@ -0,0 +1 @@
+tv_hchacha20: ok