From 48f2d917b9aca298c3c0a4c93402e08956c97467 Mon Sep 17 00:00:00 2001
From: Ethan Looney <ethan@wolfssl.com>
Date: Fri, 13 Nov 2020 14:13:37 -0700
Subject: [PATCH 1/3] Added unit tests for blake2b

---
 tests/api.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/api.c b/tests/api.c
index bd7bf1bfe..92d11c64e 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -5877,6 +5877,48 @@ static int test_wc_InitBlake2b (void)
     return ret;
 }     /*END test_wc_InitBlake2b*/
 
+/*
+ * Unit test for the wc_InitBlake2b_WithKey()
+ */
+static int test_wc_InitBlake2b_WithKey (void)
+{
+    int ret = 0;
+#ifdef HAVE_BLAKE2
+    Blake2b     blake2;
+    word32      digestSz = BLAKE2B_KEYBYTES;
+    byte        *key = (byte*)"01234567890123456789012345678901";
+    word32      keylen = BLAKE2B_KEYBYTES;
+
+    printf(testingFmt, "wc_InitBlake2b_WithKey()");
+
+    /* Test good arg. */
+    ret = wc_InitBlake2b_WithKey(&blake2, digestSz, key, keylen);
+    if (ret != 0) {
+        ret = WOLFSSL_FATAL_ERROR;
+    }
+    /* Test bad args. */
+    if (ret == 0) {
+        ret = wc_InitBlake2b_WithKey(NULL, digestSz, key, keylen);
+        if (ret == BAD_FUNC_ARG) {
+            ret = 0;
+        }
+    }
+    if (ret == 0) {
+        ret = wc_InitBlake2b_WithKey(&blake2, digestSz, key, 256);
+        if (ret == BAD_FUNC_ARG) {
+            ret = 0;
+        }
+    }
+    if (ret == 0) {
+        ret = wc_InitBlake2b_WithKey(&blake2, digestSz, NULL, keylen);
+    }
+
+    printf(resultFmt, ret == 0 ? passed : failed);
+
+#endif
+    return ret;
+}     /*END wc_InitBlake2b_WithKey*/
+
 /*
  * Unit test for the wc_InitBlake2s_WithKey()
  */
@@ -39012,7 +39054,11 @@ void ApiTest(void)
     AssertFalse(test_wc_Sha224GetHash());
     AssertFalse(test_wc_Sha224Copy());
     AssertFalse(test_wc_InitBlake2b());
+<<<<<<< HEAD
     AssertFalse(test_wc_InitBlake2s_WithKey());
+=======
+    AssertFalse(test_wc_InitBlake2b_WithKey());
+>>>>>>> Added unit tests for blake2b
     AssertFalse(test_wc_InitRipeMd());
     AssertFalse(test_wc_RipeMdUpdate());
     AssertFalse(test_wc_RipeMdFinal());

From 549c446aaa942825bff206eb3e70f2611465ac7d Mon Sep 17 00:00:00 2001
From: Ethan Looney <ethan@wolfssl.com>
Date: Mon, 16 Nov 2020 13:17:49 -0700
Subject: [PATCH 2/3] Removed leftovers from merge conflict

---
 tests/api.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/api.c b/tests/api.c
index 92d11c64e..02371ae63 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -39054,11 +39054,8 @@ void ApiTest(void)
     AssertFalse(test_wc_Sha224GetHash());
     AssertFalse(test_wc_Sha224Copy());
     AssertFalse(test_wc_InitBlake2b());
-<<<<<<< HEAD
-    AssertFalse(test_wc_InitBlake2s_WithKey());
-=======
     AssertFalse(test_wc_InitBlake2b_WithKey());
->>>>>>> Added unit tests for blake2b
+    AssertFalse(test_wc_InitBlake2s_WithKey());
     AssertFalse(test_wc_InitRipeMd());
     AssertFalse(test_wc_RipeMdUpdate());
     AssertFalse(test_wc_RipeMdFinal());

From 3692c760b99bd46fefaa512e9149c5b5d72a8684 Mon Sep 17 00:00:00 2001
From: Ethan Looney <ethan@wolfssl.com>
Date: Tue, 17 Nov 2020 14:03:08 -0700
Subject: [PATCH 3/3] Changed key to size BLAKE2B_KEYBYTES

---
 tests/api.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/api.c b/tests/api.c
index 02371ae63..dcd81fd13 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -5886,9 +5886,11 @@ static int test_wc_InitBlake2b_WithKey (void)
 #ifdef HAVE_BLAKE2
     Blake2b     blake2;
     word32      digestSz = BLAKE2B_KEYBYTES;
-    byte        *key = (byte*)"01234567890123456789012345678901";
+    byte        key[BLAKE2B_KEYBYTES];
     word32      keylen = BLAKE2B_KEYBYTES;
 
+
+
     printf(testingFmt, "wc_InitBlake2b_WithKey()");
 
     /* Test good arg. */