Skip to content

Commit 4a51ed4

Browse files
douzzerdouzzer
committed
wolfcrypt/test/test.c: add FIPS gates around "Copy cleanup test" exercises added by 4713ad5 (#9829).
1 parent 1c8d593 commit 4a51ed4

1 file changed

Lines changed: 22 additions & 0 deletions

File tree

‎wolfcrypt/test/test.c‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4564,6 +4564,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha_test(void)
45644564
} /* END LARGE HASH TEST */
45654565
#endif /* NO_LARGE_HASH_TEST */
45664566

4567+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
45674568
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
45684569
* resources (e.g., msg buffer, W cache). Detectable by valgrind/ASAN. */
45694570
wc_ShaFree(&sha);
@@ -4587,6 +4588,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha_test(void)
45874588
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
45884589
if (XMEMCMP(hash, a.output, WC_SHA_DIGEST_SIZE) != 0)
45894590
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
4591+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
45904592

45914593
exit:
45924594

@@ -5027,6 +5029,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha224_test(void)
50275029
ERROR_OUT(WC_TEST_RET_ENC_I(i), exit);
50285030
}
50295031

5032+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
50305033
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
50315034
* resources (e.g., msg buffer, W cache). Detectable by valgrind/ASAN. */
50325035
wc_Sha224Free(&sha);
@@ -5050,6 +5053,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha224_test(void)
50505053
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
50515054
if (XMEMCMP(hash, a.output, WC_SHA224_DIGEST_SIZE) != 0)
50525055
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
5056+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
50535057

50545058
exit:
50555059
wc_Sha224Free(&sha);
@@ -5275,6 +5279,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha256_test(void)
52755279
}
52765280
#endif
52775281

5282+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
52785283
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
52795284
* resources (e.g., msg buffer, W cache). Detectable by valgrind/ASAN. */
52805285
wc_Sha256Free(&sha);
@@ -5298,6 +5303,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha256_test(void)
52985303
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
52995304
if (XMEMCMP(hash, a.output, WC_SHA256_DIGEST_SIZE) != 0)
53005305
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
5306+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
53015307

53025308
exit:
53035309

@@ -5516,6 +5522,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha512_test(void)
55165522
#undef LARGE_HASH_TEST_INPUT_SZ
55175523
#endif /* NO_LARGE_HASH_TEST */
55185524

5525+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
55195526
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
55205527
* resources (e.g., msg buffer, W cache). Detectable by valgrind/ASAN. */
55215528
wc_Sha512Free(&sha);
@@ -5539,6 +5546,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha512_test(void)
55395546
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
55405547
if (XMEMCMP(hash, a.output, WC_SHA512_DIGEST_SIZE) != 0)
55415548
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
5549+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
55425550

55435551
exit:
55445552

@@ -5961,6 +5969,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha384_test(void)
59615969
} /* END LARGE HASH TEST */
59625970
#endif /* NO_LARGE_HASH_TEST */
59635971

5972+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
59645973
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
59655974
* resources (e.g., msg buffer, W cache). Detectable by valgrind/ASAN. */
59665975
wc_Sha384Free(&sha);
@@ -5984,6 +5993,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t sha384_test(void)
59845993
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
59855994
if (XMEMCMP(hash, a.output, WC_SHA384_DIGEST_SIZE) != 0)
59865995
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
5996+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
59875997

59885998
exit:
59895999

@@ -6083,6 +6093,7 @@ static wc_test_ret_t sha3_224_test(void)
60836093
} /* END LARGE HASH TEST */
60846094
#endif /* NO_LARGE_HASH_TEST */
60856095

6096+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
60866097
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
60876098
* resources (e.g., hardware contexts). Detectable by valgrind/ASAN. */
60886099
wc_Sha3_224_Free(&sha);
@@ -6106,6 +6117,7 @@ static wc_test_ret_t sha3_224_test(void)
61066117
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
61076118
if (XMEMCMP(hash, a.output, WC_SHA3_224_DIGEST_SIZE) != 0)
61086119
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
6120+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
61096121

61106122
exit:
61116123
wc_Sha3_224_Free(&sha);
@@ -6237,6 +6249,7 @@ static wc_test_ret_t sha3_256_test(void)
62376249
}
62386250
#endif /* WOLFSSL_HASH_FLAGS && !WOLFSSL_ASYNC_CRYPT */
62396251

6252+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
62406253
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
62416254
* resources (e.g., hardware contexts). Detectable by valgrind/ASAN. */
62426255
wc_Sha3_256_Free(&sha);
@@ -6260,6 +6273,7 @@ static wc_test_ret_t sha3_256_test(void)
62606273
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
62616274
if (XMEMCMP(hash, a.output, WC_SHA3_256_DIGEST_SIZE) != 0)
62626275
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
6276+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
62636277

62646278
exit:
62656279
wc_Sha3_256_Free(&sha);
@@ -6391,6 +6405,7 @@ static wc_test_ret_t sha3_384_test(void)
63916405
} /* END LARGE HASH TEST */
63926406
#endif /* NO_LARGE_HASH_TEST */
63936407

6408+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
63946409
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
63956410
* resources (e.g., hardware contexts). Detectable by valgrind/ASAN. */
63966411
wc_Sha3_384_Free(&sha);
@@ -6414,6 +6429,7 @@ static wc_test_ret_t sha3_384_test(void)
64146429
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
64156430
if (XMEMCMP(hash, a.output, WC_SHA3_384_DIGEST_SIZE) != 0)
64166431
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
6432+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
64176433

64186434
exit:
64196435
wc_Sha3_384_Free(&sha);
@@ -6526,6 +6542,7 @@ static wc_test_ret_t sha3_512_test(void)
65266542
} /* END LARGE HASH TEST */
65276543
#endif /* NO_LARGE_HASH_TEST */
65286544

6545+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
65296546
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
65306547
* resources (e.g., hardware contexts). Detectable by valgrind/ASAN. */
65316548
wc_Sha3_512_Free(&sha);
@@ -6549,6 +6566,7 @@ static wc_test_ret_t sha3_512_test(void)
65496566
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
65506567
if (XMEMCMP(hash, a.output, WC_SHA3_512_DIGEST_SIZE) != 0)
65516568
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
6569+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
65526570

65536571
exit:
65546572
wc_Sha3_512_Free(&sha);
@@ -6940,6 +6958,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t shake128_test(void)
69406958
if (ret != 0)
69416959
ERROR_OUT(ret, exit);
69426960

6961+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
69436962
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
69446963
* resources (e.g., hardware contexts). Detectable by valgrind/ASAN. */
69456964
wc_Shake128_Free(&sha);
@@ -6963,6 +6982,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t shake128_test(void)
69636982
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
69646983
if (XMEMCMP(hash, a.output, a.outLen) != 0)
69656984
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
6985+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
69666986

69676987
exit:
69686988
wc_Shake128_Free(&sha);
@@ -7315,6 +7335,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t shake256_test(void)
73157335
if (ret != 0)
73167336
ERROR_OUT(ret, exit);
73177337

7338+
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
73187339
/* Copy cleanup test: verify Copy into a previously-used dst does not leak
73197340
* resources (e.g., hardware contexts). Detectable by valgrind/ASAN. */
73207341
wc_Shake256_Free(&sha);
@@ -7338,6 +7359,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t shake256_test(void)
73387359
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit);
73397360
if (XMEMCMP(hash, a.output, a.outLen) != 0)
73407361
ERROR_OUT(WC_TEST_RET_ENC_NC, exit);
7362+
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION_GE(7, 0)) */
73417363

73427364
exit:
73437365
wc_Shake256_Free(&sha);

0 commit comments

Comments
 (0)