Skip to content

Commit e7ef3ab

Browse files
committed
Digest tests: add more tests
Add testing of MD2 and Md4. Add more tests of functions in hash.c. Reformat data to match what is output by PRINT_DATA macro.
1 parent 72d08a1 commit e7ef3ab

File tree

20 files changed

+1831
-706
lines changed

20 files changed

+1831
-706
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2512,6 +2512,8 @@ if(WOLFSSL_EXAMPLES)
25122512
# Build unit tests
25132513
add_executable(unit_test
25142514
tests/api.c
2515+
tests/api/test_md2.c
2516+
tests/api/test_md4.c
25152517
tests/api/test_md5.c
25162518
tests/api/test_sha.c
25172519
tests/api/test_sha256.c

tests/api.c

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@
290290
#include <tests/api/api.h>
291291

292292
/* Gather test declarations to include them in the testCases array */
293+
#include <tests/api/test_md2.h>
294+
#include <tests/api/test_md4.h>
293295
#include <tests/api/test_md5.h>
294296
#include <tests/api/test_sha.h>
295297
#include <tests/api/test_sha256.h>
@@ -88997,6 +88999,21 @@ TEST_CASE testCases[] = {
8899788999
TEST_DECL(test_wc_LockMutex_ex),
8899889000

8899989001
/* Digests */
89002+
/* test_md2.c */
89003+
TEST_DECL(test_wc_InitMd2),
89004+
TEST_DECL(test_wc_Md2Update),
89005+
TEST_DECL(test_wc_Md2Final),
89006+
TEST_DECL(test_wc_Md2_KATs),
89007+
TEST_DECL(test_wc_Md2_other),
89008+
TEST_DECL(test_wc_Md2Hash),
89009+
89010+
/* test_md4.c */
89011+
TEST_DECL(test_wc_InitMd4),
89012+
TEST_DECL(test_wc_Md4Update),
89013+
TEST_DECL(test_wc_Md4Final),
89014+
TEST_DECL(test_wc_Md4_KATs),
89015+
TEST_DECL(test_wc_Md4_other),
89016+
8900089017
/* test_md5.c */
8900189018
TEST_DECL(test_wc_InitMd5),
8900289019
TEST_DECL(test_wc_Md5Update),
@@ -89145,7 +89162,6 @@ TEST_CASE testCases[] = {
8914589162
TEST_DECL(test_wc_Sm3Copy),
8914689163
TEST_DECL(test_wc_Sm3GetHash),
8914789164
TEST_DECL(test_wc_Sm3_Flags),
89148-
TEST_DECL(test_wc_Sm3Hash),
8914989165

8915089166
/* test_ripemd.c */
8915189167
TEST_DECL(test_wc_InitRipeMd),
@@ -89156,8 +89172,17 @@ TEST_CASE testCases[] = {
8915689172

8915789173
/* test_hash.c */
8915889174
TEST_DECL(test_wc_HashInit),
89175+
TEST_DECL(test_wc_HashUpdate),
89176+
TEST_DECL(test_wc_HashFinal),
89177+
TEST_DECL(test_wc_HashNewDelete),
89178+
TEST_DECL(test_wc_HashGetDigestSize),
89179+
TEST_DECL(test_wc_HashGetBlockSize),
89180+
TEST_DECL(test_wc_Hash),
8915989181
TEST_DECL(test_wc_HashSetFlags),
8916089182
TEST_DECL(test_wc_HashGetFlags),
89183+
TEST_DECL(test_wc_Hash_Algs),
89184+
TEST_DECL(test_wc_HashGetOID),
89185+
TEST_DECL(test_wc_OidGetHash),
8916189186

8916289187
/* HMAC */
8916389188
TEST_DECL(test_wc_Md5HmacSetKey),

tests/api/include.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
if BUILD_TESTS
66
# Digests
7+
tests_unit_test_SOURCES += tests/api/test_md2.c
8+
tests_unit_test_SOURCES += tests/api/test_md4.c
79
tests_unit_test_SOURCES += tests/api/test_md5.c
810
tests_unit_test_SOURCES += tests/api/test_sha.c
911
tests_unit_test_SOURCES += tests/api/test_sha256.c
@@ -37,6 +39,8 @@ tests_unit_test_SOURCES += tests/api/test_ocsp.c
3739
endif
3840

3941
EXTRA_DIST += tests/api/api.h
42+
EXTRA_DIST += tests/api/test_md2.h
43+
EXTRA_DIST += tests/api/test_md4.h
4044
EXTRA_DIST += tests/api/test_md5.h
4145
EXTRA_DIST += tests/api/test_sha.h
4246
EXTRA_DIST += tests/api/test_sha256.h

tests/api/test_blake2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ int test_wc_Blake2sFinal(void)
395395
EXPECT_DECLS;
396396
#ifdef HAVE_BLAKE2S
397397
Blake2s blake;
398-
byte hash[WC_BLAKE2B_DIGEST_SIZE];
398+
byte hash[WC_BLAKE2S_DIGEST_SIZE];
399399

400400
/* Initialize */
401401
ExpectIntEQ(wc_InitBlake2s(&blake, WC_BLAKE2S_DIGEST_SIZE), 0);
@@ -407,7 +407,7 @@ int test_wc_Blake2sFinal(void)
407407
ExpectIntEQ(wc_Blake2sFinal(NULL, hash, 0), WC_NO_ERR_TRACE(BAD_FUNC_ARG));
408408

409409
/* Test good args. */
410-
ExpectIntEQ(wc_Blake2sFinal(&blake, hash, WC_BLAKE2B_DIGEST_SIZE), 0);
410+
ExpectIntEQ(wc_Blake2sFinal(&blake, hash, WC_BLAKE2S_DIGEST_SIZE), 0);
411411
#endif
412412
return EXPECT_RESULT();
413413
}

tests/api/test_digest.h

Lines changed: 185 additions & 15 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)