From f2ce8dcbcaa6cca4ab35a2633376402d175fc98d Mon Sep 17 00:00:00 2001
From: Quinn Miller <quinn@wolfssl.com>
Date: Tue, 22 May 2018 10:47:44 -0600
Subject: [PATCH] Added unit test for Blake2

---
 tests/api.c             | 76 +++++++++++++++++++++++++++++++++++++++++
 wolfcrypt/src/blake2b.c |  3 ++
 2 files changed, 79 insertions(+)

diff --git a/tests/api.c b/tests/api.c
index 194045dcb..daa8f2666 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -214,6 +214,10 @@
     #include <wolfssl/wolfcrypt/arc4.h>
 #endif
 
+#ifdef HAVE_BLAKE2
+    #include <wolfssl/wolfcrypt/blake2.h>
+#endif
+
 
 #ifndef NO_RSA
     #include <wolfssl/wolfcrypt/rsa.h>
@@ -3157,6 +3161,77 @@ static void test_wolfSSL_mcast(void)
  |  Wolfcrypt
  *----------------------------------------------------------------------------*/
 
+/* 
+ * Unit test for the wc_InitBlake2b()
+ */
+static int test_wc_InitBlake2b (void)
+{
+    int ret = 0;
+#ifdef HAVE_BLAKE2
+
+    Blake2b blake2;
+
+    printf(testingFmt, "wc_InitBlake2B()");
+
+    /* Test good arg. */
+    ret = wc_InitBlake2b(&blake2, 64);
+    if (ret != 0) {
+        ret = WOLFSSL_FATAL_ERROR;
+    }
+
+    /* Test bad arg. */
+    if (!ret) {
+        ret = wc_InitBlake2b(NULL, 64);
+        if (ret == 0) {
+            ret = WOLFSSL_FATAL_ERROR;
+        } else {
+            ret = 0;
+        }
+    }
+
+    if (!ret) {
+        ret = wc_InitBlake2b(NULL, 128);
+        if (ret == 0) {
+            ret = WOLFSSL_FATAL_ERROR;
+        } else {
+            ret = 0;
+        }
+    }
+
+    if (!ret) {
+        ret = wc_InitBlake2b(&blake2, 128);
+        if (ret == 0) {
+            ret = WOLFSSL_FATAL_ERROR;
+        } else {
+            ret = 0;
+        }
+    }
+
+    if (!ret) {
+        ret = wc_InitBlake2b(NULL, 0);
+        if (ret == 0) {
+            ret = WOLFSSL_FATAL_ERROR;
+        } else {
+            ret = 0;
+        }
+    }
+
+    if (!ret) {
+        ret = wc_InitBlake2b(&blake2, 0);
+        if (ret == 0) {
+            ret = WOLFSSL_FATAL_ERROR;
+        } else {
+            ret = 0;
+        }
+    }
+
+    printf(resultFmt, ret == 0 ? passed : failed);
+
+#endif
+    return ret;
+}     /*END test_wc_InitBlake2b*/
+
+
 /*
  * Unit test for the wc_InitMd5()
  */
@@ -18837,6 +18912,7 @@ void ApiTest(void)
     AssertFalse(test_wc_InitSha224());
     AssertFalse(test_wc_Sha224Update());
     AssertFalse(test_wc_Sha224Final());
+    AssertFalse(test_wc_InitBlake2b());
     AssertFalse(test_wc_InitRipeMd());
     AssertFalse(test_wc_RipeMdUpdate());
     AssertFalse(test_wc_RipeMdFinal());
diff --git a/wolfcrypt/src/blake2b.c b/wolfcrypt/src/blake2b.c
index 2c99c2a75..d043da8a2 100644
--- a/wolfcrypt/src/blake2b.c
+++ b/wolfcrypt/src/blake2b.c
@@ -422,6 +422,9 @@ int main( int argc, char **argv )
 /* Init Blake2b digest, track size in case final doesn't want to "remember" */
 int wc_InitBlake2b(Blake2b* b2b, word32 digestSz)
 {
+    if (b2b == NULL){
+        return -1;
+    }
     b2b->digestSz = digestSz;
 
     return blake2b_init(b2b->S, (byte)digestSz);