mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-08-01 03:34:39 +02:00
add optional cryptocb test disable macro to wolfCrypt tests
This commit is contained in:
18
configure.ac
18
configure.ac
@@ -8475,6 +8475,19 @@ AC_ARG_ENABLE([cryptocb],
|
||||
[ ENABLED_CRYPTOCB=no ]
|
||||
)
|
||||
|
||||
# Enable testing of cryptoCb using software crypto. On platforms where wolfCrypt tests
|
||||
# are used to test a custom cryptoCb, it may be desired to disable this so wolfCrypt tests
|
||||
# don't also test software implementations of every algorithm
|
||||
AC_ARG_ENABLE([cryptocb-sw-test],
|
||||
[AS_HELP_STRING([--disable-cryptocb-sw-test],[Disable wolfCrypt crypto callback tests using software crypto (default: enabled). Only valid with --enable-cryptocb])],
|
||||
[ if test "x$ENABLED_CRYPTOCB" = "xno"; then
|
||||
AC_MSG_ERROR([--disable-cryptocb-sw-test requires --enable-cryptocb])
|
||||
else
|
||||
ENABLED_CRYPTOCB_SW_TEST=$enableval
|
||||
fi ],
|
||||
[ ENABLED_CRYPTOCB_SW_TEST=yes ]
|
||||
)
|
||||
|
||||
if test "x$ENABLED_PKCS11" = "xyes" || test "x$ENABLED_WOLFTPM" = "xyes" || test "$ENABLED_CAAM" != "no"
|
||||
then
|
||||
ENABLED_CRYPTOCB=yes
|
||||
@@ -8484,6 +8497,11 @@ then
|
||||
AM_CFLAGS="$AM_CFLAGS -DWOLF_CRYPTO_CB"
|
||||
fi
|
||||
|
||||
if test "$ENABLED_CRYPTOCB_SW_TEST" = "no"
|
||||
then
|
||||
AM_CFLAGS="$AM_CFLAGS -DWC_TEST_NO_CRYPTOCB_SW_TEST"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Asynchronous Crypto
|
||||
|
@@ -735,7 +735,7 @@ void printOutput(const char *strName, unsigned char *data, unsigned int dataSz);
|
||||
WOLFSSL_TEST_SUBROUTINE int ariagcm_test(MC_ALGID);
|
||||
#endif
|
||||
|
||||
#ifdef WOLF_CRYPTO_CB
|
||||
#if defined(WOLF_CRYPTO_CB) && !defined(WC_TEST_NO_CRYPTOCB_SW_TEST)
|
||||
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t cryptocb_test(void);
|
||||
#endif
|
||||
#ifdef WOLFSSL_CERT_PIV
|
||||
@@ -2321,7 +2321,7 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\
|
||||
TEST_PASS("blob test passed!\n");
|
||||
#endif
|
||||
|
||||
#if defined(WOLF_CRYPTO_CB) && \
|
||||
#if defined(WOLF_CRYPTO_CB) && !defined(WC_TEST_NO_CRYPTOCB_SW_TEST) && \
|
||||
!(defined(HAVE_INTEL_QAT_SYNC) || defined(HAVE_CAVIUM_OCTEON_SYNC) || \
|
||||
defined(WOLFSSL_QNX_CAAM) || defined(HAVE_RENESAS_SYNC))
|
||||
if ( (ret = cryptocb_test()) != 0)
|
||||
@@ -55567,6 +55567,7 @@ static int myCryptoCbFind(int currentId, int algoType)
|
||||
#endif /* WOLF_CRYPTO_CB_FIND */
|
||||
|
||||
|
||||
#if !defined(WC_TEST_NO_CRYPTOCB_SW_TEST)
|
||||
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t cryptocb_test(void)
|
||||
{
|
||||
wc_test_ret_t ret = 0;
|
||||
@@ -55695,6 +55696,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t cryptocb_test(void)
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif /* ! WC_TEST_NO_CRYPTOCB_SW_TEST */
|
||||
#endif /* WOLF_CRYPTO_CB */
|
||||
|
||||
#ifdef WOLFSSL_CERT_PIV
|
||||
|
Reference in New Issue
Block a user