wolfssl/wolfcrypt/types.h: restore WC_ALLOC_DO_ON_FAILURE fallback definition from 760178c -- reversion in part of 5f4d499. fixes optest build failures in all-crypto-only-intelasm-fips-v5-linuxkm-next-insmod-optest, all-crypto-only-intelasm-fips-v6-linuxkm-next-insmod-optest, and all-crypto-only-intelasm-fips-dev-linuxkm-next-insmod-optest.

Author: douzzer

tests/api/test_aes.c

@@ -34,8 +34,6 @@
 #include <tests/api/api.h>
 #include <tests/api/test_aes.h>
 
-#define WC_ALLOC_DO_ON_FAILURE() WC_DO_NOTHING
-
 /*******************************************************************************
  * AES
  ******************************************************************************/

tests/api/test_rsa.c

@@ -33,8 +33,6 @@
 #include <tests/api/api.h>
 #include <tests/api/test_rsa.h>
 
-#define WC_ALLOC_DO_ON_FAILURE() WC_DO_NOTHING
-
 /*
  * Testing wc_Init RsaKey()
  */

wolfcrypt/benchmark/benchmark.c

@@ -69,6 +69,7 @@
 /* Macro to disable benchmark */
 #ifndef NO_CRYPT_BENCHMARK
 
+#undef WC_ALLOC_DO_ON_FAILURE
 #define WC_ALLOC_DO_ON_FAILURE() do { printf("out of memory at benchmark.c L %d\n", __LINE__); ret = MEMORY_E; goto exit; } while (0)
 
 #include <wolfssl/wolfcrypt/types.h>

wolfcrypt/test/test.c

@@ -1896,8 +1896,6 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t nist_sp80056c_twostep_cmac(void)
     }
 #endif
 
-#define WC_ALLOC_DO_ON_FAILURE() WC_DO_NOTHING
-
 #ifdef TEST_ALWAYS_RUN_TO_END
     #define TEST_FAIL(msg, retval) do { last_failed_test_ret = (retval); wc_test_render_error_message(msg, retval); } while (0)
 #elif !defined(TEST_FAIL)

wolfssl/wolfcrypt/types.h

@@ -825,6 +825,9 @@ enum {
 #include <wolfssl/wolfcrypt/memory.h>
 
 /* declare/free variable handling for async and smallstack */
+#ifndef WC_ALLOC_DO_ON_FAILURE
+    #define WC_ALLOC_DO_ON_FAILURE() WC_DO_NOTHING
+#endif
 
 #define WC_DECLARE_HEAP_ARRAY(VAR_NAME, VAR_TYPE, VAR_ITEMS, VAR_SIZE, HEAP) \
     VAR_TYPE* VAR_NAME[VAR_ITEMS] = { NULL, };                               \