1 files changed, 41 insertions, 21 deletions

diff --git a/test/default/chacha20.c b/test/default/chacha20.c
index 6dbc16c..b4334a8 100644
--- a/test/default/chacha20.c
+++ b/test/default/chacha20.c
@@ -1,7 +1,4 @@
 
-#include <stdio.h>
-#include <string.h>
-
 #define TEST_NAME "chacha20"
 #include "cmptest.h"
 
@@ -10,36 +7,59 @@ static void tv(void)
     static struct {
         const char *key_hex;
         const char *nonce_hex;
-    } tests[] = {
-        {"0000000000000000000000000000000000000000000000000000000000000000","0000000000000000"},
-        {"0000000000000000000000000000000000000000000000000000000000000001","0000000000000000"},
-        {"0000000000000000000000000000000000000000000000000000000000000000","0000000000000001"},
-        {"0000000000000000000000000000000000000000000000000000000000000000","0100000000000000"},
-        {"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f","0001020304050607"}
-    };
+    } tests[]
+      = { { "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000" },
+          { "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000" },
+          { "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000001" },
+          { "0000000000000000000000000000000000000000000000000000000000000000",
+            "0100000000000000" },
+          { "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
+            "0001020304050607" } };
     unsigned char key[crypto_stream_chacha20_KEYBYTES];
     unsigned char nonce[crypto_stream_chacha20_NONCEBYTES];
-    unsigned char out[60];
-    char          out_hex[60 * 2 + 1];
-    size_t        i = 0U;
+    unsigned char out[160];
+    char out_hex[160 * 2 + 1];
+    size_t i = 0U;
 
     do {
-        sodium_hex2bin((unsigned char *) key, sizeof key,
-                       tests[i].key_hex, strlen(tests[i].key_hex),
-                       NULL, NULL, NULL);
-        sodium_hex2bin(nonce, sizeof nonce,
-                       tests[i].nonce_hex, strlen(tests[i].nonce_hex),
-                       NULL, NULL, NULL);
+        sodium_hex2bin((unsigned char *)key, sizeof key, tests[i].key_hex,
+                       strlen(tests[i].key_hex), NULL, NULL, NULL);
+        sodium_hex2bin(nonce, sizeof nonce, tests[i].nonce_hex,
+                       strlen(tests[i].nonce_hex), NULL, NULL, NULL);
         crypto_stream_chacha20(out, sizeof out, nonce, key);
         sodium_bin2hex(out_hex, sizeof out_hex, out, sizeof out);
         printf("[%s]\n", out_hex);
     } while (++i < (sizeof tests) / (sizeof tests[0]));
+
+    memset(out, 0x42, sizeof out);
+
+    assert(crypto_stream_chacha20(out, 0U, nonce, key) == 0);
+    assert(crypto_stream_chacha20_xor(out, out, 0U, nonce, key) == 0);
+    assert(crypto_stream_chacha20_xor(out, out, 0U, nonce, key) == 0);
+    assert(crypto_stream_chacha20_xor_ic(out, out, 0U, nonce, 1U, key) == 0);
+
+    crypto_stream_chacha20_xor(out, out, sizeof out, nonce, key);
+    sodium_bin2hex(out_hex, sizeof out_hex, out, sizeof out);
+    printf("[%s]\n", out_hex);
+
+    crypto_stream_chacha20_xor_ic(out, out, sizeof out, nonce, 0U, key);
+    sodium_bin2hex(out_hex, sizeof out_hex, out, sizeof out);
+    printf("[%s]\n", out_hex);
+
+    crypto_stream_chacha20_xor_ic(out, out, sizeof out, nonce, 1U, key);
+    sodium_bin2hex(out_hex, sizeof out_hex, out, sizeof out);
+    printf("[%s]\n", out_hex);
 };
 
 int main(void)
 {
     tv();
 
-    return 0;    
-}
+    assert(crypto_stream_chacha20_keybytes() > 0U);
+    assert(crypto_stream_chacha20_noncebytes() > 0U);
 
+    return 0;
+}