wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

moved some macro logic from test.c to settings.h

Browse Source
This commit is contained in:
Brett Nicholas
2024-10-31 10:51:51 -06:00
parent cac11e3d09
commit 17c7b6cc3a
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/test/test.c
View File

@@ -30871,10 +30871,7 @@ static wc_test_ret_t ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerif
#ifdef HAVE_ECC_SIGN #ifdef HAVE_ECC_SIGN
/* ECC w/out Shamir has issue with all 0 digest */ /* ECC w/out Shamir has issue with all 0 digest */
/* WC_BIGINT doesn't have 0 len well on hardware */ /* WC_BIGINT doesn't have 0 len well on hardware */
/* Cryptocell has issues with all 0 digest */ #if defined(ECC_SHAMIR) && !defined(WC_TEST_NO_ECC_SIGN_VERIFY_ZERO_DIGEST)
#if defined(ECC_SHAMIR) && !defined(WOLFSSL_ASYNC_CRYPT) && \
!defined(WOLFSSL_CRYPTOCELL) && \
!defined(WC_TEST_NO_ECC_SIGN_VERIFY_ZERO_DIGEST)
/* test DSA sign hash with zeros */ /* test DSA sign hash with zeros */
for (i = 0; i < (int)ECC_DIGEST_SIZE; i++) { for (i = 0; i < (int)ECC_DIGEST_SIZE; i++) {
digest[i] = 0; digest[i] = 0;
@@ -30911,9 +30908,7 @@ static wc_test_ret_t ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerif
TEST_SLEEP(); TEST_SLEEP();
} }
#endif /* HAVE_ECC_VERIFY */ #endif /* HAVE_ECC_VERIFY */
#endif /* ECC_SHAMIR && !WOLFSSL_ASYNC_CRYPT && !WOLFSSL_CRYPTOCELL #endif /* ECC_SHAMIR && !WC_TEST_NO_ECC_SIGN_VERIFY_ZERO_DIGEST */
* && !WC_TEST_NO_ECC_SIGN_VERIFY_ZERO_DIGEST
*/
/* test DSA sign hash with sequence (0,1,2,3,4,...) */ /* test DSA sign hash with sequence (0,1,2,3,4,...) */
for (i = 0; i < (int)ECC_DIGEST_SIZE; i++) { for (i = 0; i < (int)ECC_DIGEST_SIZE; i++) {

14
wolfssl/wolfcrypt/settings.h
View File

@@ -3168,6 +3168,14 @@ extern void uITRON4_free(void *p) ;
#undef NO_DH #undef NO_DH
#endif #endif
/* CryptoCell defines */
#ifdef WOLFSSL_CRYPTOCELL
#if defined(HAVE_ECC) && defined(HAVE_ECC_SIGN)
/* Don't attempt to sign/verify an all-zero digest in wolfCrypt tests */
#define WC_TEST_NO_ECC_SIGN_VERIFY_ZERO_DIGEST
#endif /* HAVE_ECC && HAVE_ECC_SIGN */
#endif
/* Asynchronous Crypto */ /* Asynchronous Crypto */
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
#if !defined(HAVE_CAVIUM) && !defined(HAVE_INTEL_QA) && \ #if !defined(HAVE_CAVIUM) && !defined(HAVE_INTEL_QA) && \
@@ -3192,6 +3200,12 @@ extern void uITRON4_free(void *p) ;
* but not required */ * but not required */
#define ECC_CACHE_CURVE #define ECC_CACHE_CURVE
#endif #endif
#if defined(HAVE_ECC) && defined(HAVE_ECC_SIGN)
/* Don't attempt to sign/verify an all-zero digest in wolfCrypt tests */
#define WC_TEST_NO_ECC_SIGN_VERIFY_ZERO_DIGEST
#endif /* HAVE_ECC && HAVE_ECC_SIGN */
#endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* WOLFSSL_ASYNC_CRYPT */
#ifndef WC_ASYNC_DEV_SIZE #ifndef WC_ASYNC_DEV_SIZE
#define WC_ASYNC_DEV_SIZE 0 #define WC_ASYNC_DEV_SIZE 0