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

Build fixes for WOLFSSL_NO_MALLOC in wolfCrypt test.

Browse Source
This commit is contained in:
David Garske
2020-04-13 07:39:06 -07:00
parent b01ce168ea
commit 1f5a7bffaa
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wolfcrypt/test/test.c
View File

@@ -10051,6 +10051,7 @@ int random_test(void)
#define MEM_TEST_SZ 1024 #define MEM_TEST_SZ 1024
#endif #endif
#if defined(WOLFSSL_STATIC_MEMORY) || !defined(WOLFSSL_NO_MALLOC)
static int simple_mem_test(int sz) static int simple_mem_test(int sz)
{ {
int ret = 0; int ret = 0;
@@ -10075,6 +10076,7 @@ static int simple_mem_test(int sz)
XFREE(b, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(b, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
return ret; return ret;
} }
#endif
int memory_test(void) int memory_test(void)
{ {
@@ -10180,10 +10182,12 @@ int memory_test(void)
(void)dist; /* avoid static analysis warning of variable not used */ (void)dist; /* avoid static analysis warning of variable not used */
#endif #endif
#if defined(WOLFSSL_STATIC_MEMORY) || !defined(WOLFSSL_NO_MALLOC)
/* simple test */ /* simple test */
ret = simple_mem_test(MEM_TEST_SZ); ret = simple_mem_test(MEM_TEST_SZ);
if (ret != 0) if (ret != 0)
return ret; return ret;
#endif
#ifdef COMPLEX_MEM_TEST #ifdef COMPLEX_MEM_TEST
/* test various size blocks */ /* test various size blocks */
@@ -10207,7 +10211,7 @@ int memory_test(void)
XFREE(b, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(b, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
return 0; return ret;
} }
@@ -27877,6 +27881,8 @@ int mutex_test(void)
} }
#if defined(USE_WOLFSSL_MEMORY) && !defined(FREERTOS) #if defined(USE_WOLFSSL_MEMORY) && !defined(FREERTOS)
#ifndef WOLFSSL_NO_MALLOC
static int malloc_cnt = 0; static int malloc_cnt = 0;
static int realloc_cnt = 0; static int realloc_cnt = 0;
static int free_cnt = 0; static int free_cnt = 0;
@@ -27888,6 +27894,7 @@ static void *my_Malloc_cb(size_t size)
return malloc(size); return malloc(size);
#else #else
WOLFSSL_MSG("No malloc available"); WOLFSSL_MSG("No malloc available");
(void)size;
return NULL; return NULL;
#endif #endif
} }
@@ -27898,6 +27905,7 @@ static void my_Free_cb(void *ptr)
free(ptr); free(ptr);
#else #else
WOLFSSL_MSG("No free available"); WOLFSSL_MSG("No free available");
(void)ptr;
#endif #endif
} }
static void *my_Realloc_cb(void *ptr, size_t size) static void *my_Realloc_cb(void *ptr, size_t size)
@@ -27907,14 +27915,19 @@ static void *my_Realloc_cb(void *ptr, size_t size)
return realloc(ptr, size); return realloc(ptr, size);
#else #else
WOLFSSL_MSG("No realloc available"); WOLFSSL_MSG("No realloc available");
(void)ptr;
(void)size;
return NULL; return NULL;
#endif #endif
} }
#endif /* !WOLFSSL_NO_MALLOC */
int memcb_test(void) int memcb_test(void)
{ {
int ret = 0; int ret = 0;
#ifndef WOLFSSL_NO_MALLOC
byte* b = NULL; byte* b = NULL;
#endif
wolfSSL_Malloc_cb mc; wolfSSL_Malloc_cb mc;
wolfSSL_Free_cb fc; wolfSSL_Free_cb fc;
wolfSSL_Realloc_cb rc; wolfSSL_Realloc_cb rc;
@@ -27960,7 +27973,7 @@ exit_memcb:
return ret; return ret;
} }
#endif #endif /* USE_WOLFSSL_MEMORY && !WOLFSSL_NO_MALLOC */
#ifdef WOLFSSL_IMX6_CAAM_BLOB #ifdef WOLFSSL_IMX6_CAAM_BLOB