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

Merge pull request #6233 from embhorn/gh6209

Browse Source 
Support HAVE_SESSION_TICKET without realloc
This commit is contained in:
JacobBarthelmeh
2023-04-05 15:17:58 -06:00
committed by GitHub
parent 3c90eb25c8 d9bf93b49f
commit 1bef3ec745
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

@ -21157,11 +21157,21 @@ static int wolfSSL_DupSessionEx(const WOLFSSL_SESSION* input,
ret = WOLFSSL_FAILURE;
}
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,
output->heap, DYNAMIC_TYPE_SESSION_TICK);
#endif /* WOLFSSL_NO_REALLOC */
if (tmp == NULL) {
WOLFSSL_MSG("Failed to allocate memory for ticket");
#ifndef WOLFSSL_NO_REALLOC
XFREE(ticBuff, output->heap, DYNAMIC_TYPE_SESSION_TICK);
ticBuff = NULL;
#endif /* WOLFSSL_NO_REALLOC */
output->ticket = NULL;
output->ticketLen = 0;
output->ticketLenAlloc = 0;

2
wolfcrypt/test/test.c
View File

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