feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek
2012-11-30 15:48:56 -08:00
parent 8c97675979 f23013b8a7
commit f71376a42b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cyassl/ctaocrypt/settings.h
View File

@ -99,6 +99,15 @@
#define USE_WINDOWS_API #define USE_WINDOWS_API
#endif #endif
#ifdef CYASSL_LEANPSK
#include <stdlib.h>
#define XMALLOC(s, h, type) malloc((s))
#define XFREE(p, h, type) free((p))
#define XREALLOC(p, n, h, t) realloc((p), (n))
#endif
#ifdef FREERTOS #ifdef FREERTOS
#define NO_WRITEV #define NO_WRITEV
#define NO_SHA512 #define NO_SHA512
@ -413,7 +422,8 @@
#endif /* MICRIUM */ #endif /* MICRIUM */
#if !defined(XMALLOC_USER) && !defined(MICRIUM_MALLOC) #if !defined(XMALLOC_USER) && !defined(MICRIUM_MALLOC) && \
!defined(CYASSL_LEANPSK)
#define USE_CYASSL_MEMORY #define USE_CYASSL_MEMORY
#endif #endif

3
cyassl/ctaocrypt/types.h
View File

@ -151,7 +151,8 @@ enum {
extern void *XREALLOC(void *p, size_t n, void* heap, int type); extern void *XREALLOC(void *p, size_t n, void* heap, int type);
extern void XFREE(void *p, void* heap, int type); extern void XFREE(void *p, void* heap, int type);
#elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) \ #elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) \
&& !defined(CYASSL_SAFERTOS) && !defined(FREESCALE_MQX) && !defined(CYASSL_SAFERTOS) && !defined(FREESCALE_MQX) \
&& !defined(CYASSL_LEANPSK)
/* default C runtime, can install different routines at runtime */ /* default C runtime, can install different routines at runtime */
#include <cyassl/ctaocrypt/memory.h> #include <cyassl/ctaocrypt/memory.h>
#define XMALLOC(s, h, t) ((void)h, (void)t, CyaSSL_Malloc((s))) #define XMALLOC(s, h, t) ((void)h, (void)t, CyaSSL_Malloc((s)))