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

based on pr#316; turns isDynamic ticket off on some failure cases, move an XFREE out of a Lock that isn't required

Browse Source
This commit is contained in:
toddouska
2016-05-13 14:11:46 -07:00
parent 1ea01a7ad8
commit 185e60ad19
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/internal.c
View File

@ -14457,6 +14457,7 @@ int DoSessionTicket(WOLFSSL* ssl,
if (ssl->session.ticket == NULL) { if (ssl->session.ticket == NULL) {
/* Set to static ticket to avoid null pointer error */ /* Set to static ticket to avoid null pointer error */
ssl->session.ticket = ssl->session.staticTicket; ssl->session.ticket = ssl->session.staticTicket;
ssl->session.isDynamic = 0;
return MEMORY_E; return MEMORY_E;
} }
ssl->session.isDynamic = 1; ssl->session.isDynamic = 1;

16
src/ssl.c
View File

@ -1298,10 +1298,8 @@ WOLFSSL_API int wolfSSL_set_SessionTicket(WOLFSSL* ssl, byte* buf, word32 bufSz)
ssl->session.isDynamic = 0; ssl->session.isDynamic = 0;
ssl->session.ticket = ssl->session.staticTicket; ssl->session.ticket = ssl->session.staticTicket;
} }
XMEMCPY(ssl->session.ticket, buf, bufSz);
} else { /* Ticket requires dynamic ticket storage */ } else { /* Ticket requires dynamic ticket storage */
if (ssl->session.ticketLen < bufSz) { if (ssl->session.ticketLen < bufSz) { /* is dyn buffer big enough */
if(ssl->session.isDynamic) if(ssl->session.isDynamic)
XFREE(ssl->session.ticket, ssl->heap, XFREE(ssl->session.ticket, ssl->heap,
DYNAMIC_TYPE_SESSION_TICK); DYNAMIC_TYPE_SESSION_TICK);
@ -1309,12 +1307,13 @@ WOLFSSL_API int wolfSSL_set_SessionTicket(WOLFSSL* ssl, byte* buf, word32 bufSz)
DYNAMIC_TYPE_SESSION_TICK); DYNAMIC_TYPE_SESSION_TICK);
if(!ssl->session.ticket) { if(!ssl->session.ticket) {
ssl->session.ticket = ssl->session.staticTicket; ssl->session.ticket = ssl->session.staticTicket;
ssl->session.isDynamic = 0;
return MEMORY_ERROR; return MEMORY_ERROR;
} }
ssl->session.isDynamic = 1; ssl->session.isDynamic = 1;
} }
XMEMCPY(ssl->session.ticket, buf, bufSz);
} }
XMEMCPY(ssl->session.ticket, buf, bufSz);
} }
ssl->session.ticketLen = (word16)bufSz; ssl->session.ticketLen = (word16)bufSz;
@ -7148,9 +7147,6 @@ int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom)
if (!ssl || !copyFrom) if (!ssl || !copyFrom)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (LockMutex(&session_mutex) != 0)
return BAD_MUTEX_E;
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
/* Free old dynamic ticket if we had one to avoid leak */ /* Free old dynamic ticket if we had one to avoid leak */
if (copyInto->isDynamic) { if (copyInto->isDynamic) {
@ -7158,6 +7154,12 @@ int GetDeepCopySession(WOLFSSL* ssl, WOLFSSL_SESSION* copyFrom)
copyInto->ticket = copyInto->staticTicket; copyInto->ticket = copyInto->staticTicket;
copyInto->isDynamic = 0; copyInto->isDynamic = 0;
} }
#endif
if (LockMutex(&session_mutex) != 0)
return BAD_MUTEX_E;
#ifdef HAVE_SESSION_TICKET
/* Size of ticket to alloc if needed; Use later for alloc outside lock */ /* Size of ticket to alloc if needed; Use later for alloc outside lock */
doDynamicCopy = copyFrom->isDynamic; doDynamicCopy = copyFrom->isDynamic;
ticketLen = copyFrom->ticketLen; ticketLen = copyFrom->ticketLen;