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

Support HAVE_SESSION_TICKET without realloc

Browse Source
This commit is contained in:
Eric Blankenhorn
2023-03-24 10:22:00 -05:00
parent 147395476f
commit d9bf93b49f
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ssl.c
View File

@ -21497,11 +21497,21 @@ static int wolfSSL_DupSessionEx(const WOLFSSL_SESSION* input,
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
else { else {
#ifdef WOLFSSL_NO_REALLOC
tmp = (byte*)XMALLOC(input->ticketLen,
output->heap, DYNAMIC_TYPE_SESSION_TICK);
XFREE(ticBuff, output->heap, DYNAMIC_TYPE_SESSION_TICK);
ticBuff = NULL;
#else
tmp = (byte*)XREALLOC(ticBuff, input->ticketLen, tmp = (byte*)XREALLOC(ticBuff, input->ticketLen,
output->heap, DYNAMIC_TYPE_SESSION_TICK); output->heap, DYNAMIC_TYPE_SESSION_TICK);
#endif /* WOLFSSL_NO_REALLOC */
if (tmp == NULL) { if (tmp == NULL) {
WOLFSSL_MSG("Failed to allocate memory for ticket"); WOLFSSL_MSG("Failed to allocate memory for ticket");
#ifndef WOLFSSL_NO_REALLOC
XFREE(ticBuff, output->heap, DYNAMIC_TYPE_SESSION_TICK); XFREE(ticBuff, output->heap, DYNAMIC_TYPE_SESSION_TICK);
ticBuff = NULL;
#endif /* WOLFSSL_NO_REALLOC */
output->ticket = NULL; output->ticket = NULL;
output->ticketLen = 0; output->ticketLen = 0;
output->ticketLenAlloc = 0; output->ticketLenAlloc = 0;

2
wolfcrypt/test/test.c
View File

@ -13603,10 +13603,10 @@ WOLFSSL_TEST_SUBROUTINE int memory_test(void)
#if !defined(USE_FAST_MATH) && !defined(WOLFSSL_NO_MALLOC) && defined(XREALLOC) #if !defined(USE_FAST_MATH) && !defined(WOLFSSL_NO_MALLOC) && defined(XREALLOC)
/* realloc test */ /* realloc test */
{ {
byte *c = NULL;
byte *b = (byte*)XMALLOC(MEM_TEST_SZ, HEAP_HINT, byte *b = (byte*)XMALLOC(MEM_TEST_SZ, HEAP_HINT,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
#ifndef WOLFSSL_NO_REALLOC #ifndef WOLFSSL_NO_REALLOC
byte *c = NULL;
if (b) { if (b) {
c = (byte*)XREALLOC(b, MEM_TEST_SZ+sizeof(word32), HEAP_HINT, c = (byte*)XREALLOC(b, MEM_TEST_SZ+sizeof(word32), HEAP_HINT,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);