mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed leftovers from merge conflict

Browse Source
This commit is contained in:
Ethan Looney 2020-11-16 13:17:49 -07:00
parent 48f2d917b9
commit 549c446aaa
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/api.c
View File

@ -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());