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

Merge pull request #8117 from rizlik/static_mem_fix_types

Browse Source 
memory: fix types in wc_LoadStaticMemory_ex()
This commit is contained in:
JacobBarthelmeh
2024-11-11 09:48:25 -07:00
committed by GitHub
parent c08bbf0333 dce9b2e7bd
commit 4996aed166
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wolfcrypt/src/memory.c
View File

@@ -669,7 +669,7 @@ static int wc_partition_static_memory(byte* buffer, word32 sz, int flag,
} }
static int wc_init_memory_heap(WOLFSSL_HEAP* heap, unsigned int listSz, static int wc_init_memory_heap(WOLFSSL_HEAP* heap, unsigned int listSz,
const unsigned int* sizeList, const unsigned int* distList) const word32 *sizeList, const word32 *distList)
{ {
unsigned int i; unsigned int i;
@@ -695,8 +695,8 @@ static int wc_init_memory_heap(WOLFSSL_HEAP* heap, unsigned int listSz,
} }
int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint, int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,
unsigned int listSz, const unsigned int* sizeList, unsigned int listSz, const word32 *sizeList,
const unsigned int* distList, unsigned char* buf, const word32 *distList, unsigned char *buf,
unsigned int sz, int flag, int maxSz) unsigned int sz, int flag, int maxSz)
{ {
WOLFSSL_HEAP* heap = NULL; WOLFSSL_HEAP* heap = NULL;
@@ -773,13 +773,8 @@ int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,
int wc_LoadStaticMemory(WOLFSSL_HEAP_HINT** pHint, int wc_LoadStaticMemory(WOLFSSL_HEAP_HINT** pHint,
unsigned char* buf, unsigned int sz, int flag, int maxSz) unsigned char* buf, unsigned int sz, int flag, int maxSz)
{ {
#ifdef WOLFSSL_LEAN_STATIC_PSK
word16 sizeList[WOLFMEM_DEF_BUCKETS] = { WOLFMEM_BUCKETS };
byte distList[WOLFMEM_DEF_BUCKETS] = { WOLFMEM_DIST };
#else
word32 sizeList[WOLFMEM_DEF_BUCKETS] = { WOLFMEM_BUCKETS }; word32 sizeList[WOLFMEM_DEF_BUCKETS] = { WOLFMEM_BUCKETS };
word32 distList[WOLFMEM_DEF_BUCKETS] = { WOLFMEM_DIST }; word32 distList[WOLFMEM_DEF_BUCKETS] = { WOLFMEM_DIST };
#endif
int ret = 0; int ret = 0;
WOLFSSL_ENTER("wc_LoadStaticMemory"); WOLFSSL_ENTER("wc_LoadStaticMemory");
@@ -817,7 +812,7 @@ int wolfSSL_MemoryPaddingSz(void)
/* Used to calculate memory size for optimum use with buckets. /* Used to calculate memory size for optimum use with buckets.
returns the suggested size rounded down to the nearest bucket. */ returns the suggested size rounded down to the nearest bucket. */
int wolfSSL_StaticBufferSz_ex(unsigned int listSz, int wolfSSL_StaticBufferSz_ex(unsigned int listSz,
const unsigned int *sizeList, const unsigned int *distList, const word32 *sizeList, const word32 *distList,
byte* buffer, word32 sz, int flag) byte* buffer, word32 sz, int flag)
{ {
word32 ava = sz; word32 ava = sz;

10
wolfssl/wolfcrypt/memory.h
View File

@@ -219,8 +219,8 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb* mf,
#endif #endif
#ifdef WOLFSSL_STATIC_MEMORY_LEAN #ifdef WOLFSSL_STATIC_MEMORY_LEAN
word16 sizeList[WOLFMEM_MAX_BUCKETS];/* memory sizes in ava list */ word32 sizeList[WOLFMEM_MAX_BUCKETS];/* memory sizes in ava list */
byte distList[WOLFMEM_MAX_BUCKETS];/* general distribution */ word32 distList[WOLFMEM_MAX_BUCKETS];/* general distribution */
#else #else
word32 maxHa; /* max concurrent handshakes */ word32 maxHa; /* max concurrent handshakes */
word32 curHa; word32 curHa;
@@ -258,8 +258,8 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb* mf,
WOLFSSL_API void* wolfSSL_SetGlobalHeapHint(void* heap); WOLFSSL_API void* wolfSSL_SetGlobalHeapHint(void* heap);
WOLFSSL_API void* wolfSSL_GetGlobalHeapHint(void); WOLFSSL_API void* wolfSSL_GetGlobalHeapHint(void);
WOLFSSL_API int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint, WOLFSSL_API int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,
unsigned int listSz, const unsigned int *sizeList, unsigned int listSz, const word32 *sizeList,
const unsigned int *distList, unsigned char* buf, unsigned int sz, const word32 *distList, unsigned char* buf, unsigned int sz,
int flag, int max); int flag, int max);
#ifdef WOLFSSL_STATIC_MEMORY_DEBUG_CALLBACK #ifdef WOLFSSL_STATIC_MEMORY_DEBUG_CALLBACK
#define WOLFSSL_DEBUG_MEMORY_ALLOC 0 #define WOLFSSL_DEBUG_MEMORY_ALLOC 0
@@ -281,7 +281,7 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb* mf,
WOLFSSL_LOCAL int FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io); WOLFSSL_LOCAL int FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io);
WOLFSSL_API int wolfSSL_StaticBufferSz_ex(unsigned int listSz, WOLFSSL_API int wolfSSL_StaticBufferSz_ex(unsigned int listSz,
const unsigned int *sizeList, const unsigned int *distList, const word32 *sizeList, const word32 *distList,
byte* buffer, word32 sz, int flag); byte* buffer, word32 sz, int flag);
WOLFSSL_API int wolfSSL_StaticBufferSz(byte* buffer, word32 sz, int flag); WOLFSSL_API int wolfSSL_StaticBufferSz(byte* buffer, word32 sz, int flag);
WOLFSSL_API int wolfSSL_MemoryPaddingSz(void); WOLFSSL_API int wolfSSL_MemoryPaddingSz(void);