wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3686 from embhorn/zd11571

Browse Source 
Fix Free/SafeRTOS with XMALLOC_USER
This commit is contained in:
toddouska
2021-02-11 13:50:55 -08:00
committed by GitHub
parent d40ea03621 f7408560c6
commit 1283a4d9f0
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wolfssl/wolfcrypt/settings.h
View File

@ -721,18 +721,20 @@ extern void uITRON4_free(void *p) ;
!defined(WOLFSSL_STATIC_MEMORY) !defined(WOLFSSL_STATIC_MEMORY)
#define XMALLOC(s, h, type) pvPortMalloc((s)) #define XMALLOC(s, h, type) pvPortMalloc((s))
#define XFREE(p, h, type) vPortFree((p)) #define XFREE(p, h, type) vPortFree((p))
#endif /* FreeRTOS pvPortRealloc() implementation can be found here:
/* FreeRTOS pvPortRealloc() implementation can be found here: https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */
https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */ #if !defined(USE_FAST_MATH) || defined(HAVE_ED25519) || \
#if !defined(USE_FAST_MATH) || defined(HAVE_ED25519) || defined(HAVE_ED448) defined(HAVE_ED448)
#if defined(WOLFSSL_ESPIDF) #if defined(WOLFSSL_ESPIDF)
/*In IDF, realloc(p, n) is equivalent to /*In IDF, realloc(p, n) is equivalent to
heap_caps_realloc(p, s, MALLOC_CAP_8BIT) */ heap_caps_realloc(p, s, MALLOC_CAP_8BIT) */
#define XREALLOC(p, n, h, t) realloc((p), (n)) #define XREALLOC(p, n, h, t) realloc((p), (n))
#else #else
#define XREALLOC(p, n, h, t) pvPortRealloc((p), (n)) #define XREALLOC(p, n, h, t) pvPortRealloc((p), (n))
#endif
#endif #endif
#endif #endif
#ifndef NO_WRITEV #ifndef NO_WRITEV
#define NO_WRITEV #define NO_WRITEV
#endif #endif
@ -910,11 +912,13 @@ extern void uITRON4_free(void *p) ;
!defined(WOLFSSL_STATIC_MEMORY) !defined(WOLFSSL_STATIC_MEMORY)
#define XMALLOC(s, h, type) pvPortMalloc((s)) #define XMALLOC(s, h, type) pvPortMalloc((s))
#define XFREE(p, h, type) vPortFree((p)) #define XFREE(p, h, type) vPortFree((p))
#endif
/* FreeRTOS pvPortRealloc() implementation can be found here: /* FreeRTOS pvPortRealloc() implementation can be found here:
https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */ https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */
#if !defined(USE_FAST_MATH) || defined(HAVE_ED25519) || defined(HAVE_ED448) #if !defined(USE_FAST_MATH) || defined(HAVE_ED25519) || \
#define XREALLOC(p, n, h, t) pvPortRealloc((p), (n)) defined(HAVE_ED448)
#define XREALLOC(p, n, h, t) pvPortRealloc((p), (n))
#endif
#endif #endif
#endif #endif