Skip to content

Commit bc7fbee

Browse files
authored
Merge pull request wolfSSL#8528 from SparkiDev/digest_test_rework_2
Digest tests: add more tests
2 parents 6188c9c + e7ef3ab commit bc7fbee

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>
@@ -89118,6 +89120,21 @@ TEST_CASE testCases[] = {
8911889120
TEST_DECL(test_wc_LockMutex_ex),
8911989121

8912089122
/* Digests */
89123+
/* test_md2.c */
89124+
TEST_DECL(test_wc_InitMd2),
89125+
TEST_DECL(test_wc_Md2Update),
89126+
TEST_DECL(test_wc_Md2Final),
89127+
TEST_DECL(test_wc_Md2_KATs),
89128+
TEST_DECL(test_wc_Md2_other),
89129+
TEST_DECL(test_wc_Md2Hash),
89130+
89131+
/* test_md4.c */
89132+
TEST_DECL(test_wc_InitMd4),
89133+
TEST_DECL(test_wc_Md4Update),
89134+
TEST_DECL(test_wc_Md4Final),
89135+
TEST_DECL(test_wc_Md4_KATs),
89136+
TEST_DECL(test_wc_Md4_other),
89137+
8912189138
/* test_md5.c */
8912289139
TEST_DECL(test_wc_InitMd5),
8912389140
TEST_DECL(test_wc_Md5Update),
@@ -89266,7 +89283,6 @@ TEST_CASE testCases[] = {
8926689283
TEST_DECL(test_wc_Sm3Copy),
8926789284
TEST_DECL(test_wc_Sm3GetHash),
8926889285
TEST_DECL(test_wc_Sm3_Flags),
89269-
TEST_DECL(test_wc_Sm3Hash),
8927089286

8927189287
/* test_ripemd.c */
8927289288
TEST_DECL(test_wc_InitRipeMd),
@@ -89277,8 +89293,17 @@ TEST_CASE testCases[] = {
8927789293

8927889294
/* test_hash.c */
8927989295
TEST_DECL(test_wc_HashInit),
89296+
TEST_DECL(test_wc_HashUpdate),
89297+
TEST_DECL(test_wc_HashFinal),
89298+
TEST_DECL(test_wc_HashNewDelete),
89299+
TEST_DECL(test_wc_HashGetDigestSize),
89300+
TEST_DECL(test_wc_HashGetBlockSize),
89301+
TEST_DECL(test_wc_Hash),
8928089302
TEST_DECL(test_wc_HashSetFlags),
8928189303
TEST_DECL(test_wc_HashGetFlags),
89304+
TEST_DECL(test_wc_Hash_Algs),
89305+
TEST_DECL(test_wc_HashGetOID),
89306+
TEST_DECL(test_wc_OidGetHash),
8928289307

8928389308
/* HMAC */
8928489309
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
@@ -38,6 +40,8 @@ tests_unit_test_SOURCES += tests/api/test_evp.c
3840
endif
3941

4042
EXTRA_DIST += tests/api/api.h
43+
EXTRA_DIST += tests/api/test_md2.h
44+
EXTRA_DIST += tests/api/test_md4.h
4145
EXTRA_DIST += tests/api/test_md5.h
4246
EXTRA_DIST += tests/api/test_sha.h
4347
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)