1 files changed, 59 insertions, 15 deletions

diff --git a/test/default/generichash.c b/test/default/generichash.c
index 42a4a39..71c12e4 100644
--- a/test/default/generichash.c
+++ b/test/default/generichash.c
@@ -1,6 +1,3 @@
-#include <stdio.h>
-
-#include "crypto_uint8.h"
 
 #define TEST_NAME "generichash"
 #include "cmptest.h"
@@ -8,20 +5,67 @@
 int main(void)
 {
 #define MAXLEN 64
-    crypto_uint8 in[MAXLEN], out[crypto_generichash_BYTES_MAX], k[crypto_generichash_KEYBYTES_MAX];
-    size_t h,i,j;
-
-    for(h = 0; h < crypto_generichash_KEYBYTES_MAX; ++h) k[h] = h;
-
-    for(i = 0; i < MAXLEN; ++i) {
-        in[i]=i;
-        crypto_generichash(out, 1 + i % crypto_generichash_BYTES_MAX,
-                           in, i,
-                           k, 1 + i % crypto_generichash_KEYBYTES_MAX);
-        for (j = 0;j < 1 + i % crypto_generichash_BYTES_MAX;++j) {
-            printf("%02x",(unsigned int) out[j]);
+    unsigned char in[MAXLEN], out[crypto_generichash_BYTES_MAX],
+        k[crypto_generichash_KEYBYTES_MAX];
+    size_t h, i, j;
+
+    for (h = 0; h < crypto_generichash_KEYBYTES_MAX; ++h)
+        k[h] = h;
+
+    for (i = 0; i < MAXLEN; ++i) {
+        in[i] = i;
+        crypto_generichash(out, 1 + i % crypto_generichash_BYTES_MAX, in, i, k,
+                           1 + i % crypto_generichash_KEYBYTES_MAX);
+        for (j = 0; j < 1 + i % crypto_generichash_BYTES_MAX; ++j) {
+            printf("%02x", (unsigned int)out[j]);
         }
         printf("\n");
     }
+
+    memset(out, 0, sizeof out);
+    crypto_generichash(out, crypto_generichash_BYTES_MAX, in, i, k, 0U);
+    for (j = 0; j < crypto_generichash_BYTES_MAX; ++j) {
+        printf("%02x", (unsigned int)out[j]);
+    }
+    printf("\n");
+
+    memset(out, 0, sizeof out);
+    crypto_generichash(out, crypto_generichash_BYTES_MAX, in, i, NULL, 1U);
+    for (j = 0; j < crypto_generichash_BYTES_MAX; ++j) {
+        printf("%02x", (unsigned int)out[j]);
+    }
+    printf("\n");
+
+    assert(crypto_generichash(out, 0U, in, sizeof in, k, sizeof k) == -1);
+    assert(crypto_generichash(out, crypto_generichash_BYTES_MAX + 1U, in, sizeof in,
+                              k, sizeof k) == -1);
+    assert(crypto_generichash(out, sizeof out, in, sizeof in,
+                              k, crypto_generichash_KEYBYTES_MAX + 1U) == -1);
+
+    assert(crypto_generichash_bytes_min() > 0U);
+    assert(crypto_generichash_bytes_max() > 0U);
+    assert(crypto_generichash_bytes() > 0U);
+    assert(crypto_generichash_bytes() >= crypto_generichash_bytes_min());
+    assert(crypto_generichash_bytes() <= crypto_generichash_bytes_max());
+    assert(crypto_generichash_keybytes_min() > 0U);
+    assert(crypto_generichash_keybytes_max() > 0U);
+    assert(crypto_generichash_keybytes() > 0U);
+    assert(crypto_generichash_keybytes() >= crypto_generichash_keybytes_min());
+    assert(crypto_generichash_keybytes() <= crypto_generichash_keybytes_max());
+    assert(strcmp(crypto_generichash_primitive(), "blake2b") == 0);
+    assert(crypto_generichash_bytes_min()
+           == crypto_generichash_blake2b_bytes_min());
+    assert(crypto_generichash_bytes_max()
+           == crypto_generichash_blake2b_bytes_max());
+    assert(crypto_generichash_bytes() == crypto_generichash_blake2b_bytes());
+    assert(crypto_generichash_keybytes_min()
+           == crypto_generichash_blake2b_keybytes_min());
+    assert(crypto_generichash_keybytes_max()
+           == crypto_generichash_blake2b_keybytes_max());
+    assert(crypto_generichash_keybytes()
+           == crypto_generichash_blake2b_keybytes());
+    assert(crypto_generichash_blake2b_saltbytes() > 0U);
+    assert(crypto_generichash_blake2b_personalbytes() > 0U);
+
     return 0;
 }