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

Fix for previous max fragment commit to correctly process a TLS packet with multiple handshake messages. Fix to free the wolfSSL objects first then wolfSSL_CTX.

Browse Source
This commit is contained in:
David Garske
2020-09-24 15:53:12 -07:00
parent bbaf4090b8
commit 5ef5c279b5
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/sniffer.c
View File

@ -677,14 +677,7 @@ void ssl_FreeSniffer(void)
wc_LockMutex(&ServerListMutex); wc_LockMutex(&ServerListMutex);
wc_LockMutex(&SessionMutex); wc_LockMutex(&SessionMutex);
srv = ServerList; /* Free sessions (wolfSSL objects) first */
while (srv) {
removeServer = srv;
srv = srv->next;
FreeSnifferServer(removeServer);
}
ServerList = NULL;
for (i = 0; i < HASH_SIZE; i++) { for (i = 0; i < HASH_SIZE; i++) {
session = SessionTable[i]; session = SessionTable[i];
while (session) { while (session) {
@ -695,6 +688,15 @@ void ssl_FreeSniffer(void)
} }
SessionCount = 0; SessionCount = 0;
/* Then server (wolfSSL_CTX) */
srv = ServerList;
while (srv) {
removeServer = srv;
srv = srv->next;
FreeSnifferServer(removeServer);
}
ServerList = NULL;
wc_UnLockMutex(&SessionMutex); wc_UnLockMutex(&SessionMutex);
wc_UnLockMutex(&ServerListMutex); wc_UnLockMutex(&ServerListMutex);
@ -3465,6 +3467,7 @@ static int DoHandShake(const byte* input, int* sslBytes,
int size; int size;
int ret = 0; int ret = 0;
WOLFSSL* ssl; WOLFSSL* ssl;
int startBytes;
(void)rhSize; (void)rhSize;
@ -3494,6 +3497,7 @@ static int DoHandShake(const byte* input, int* sslBytes,
input += HANDSHAKE_HEADER_SZ; input += HANDSHAKE_HEADER_SZ;
*sslBytes -= HANDSHAKE_HEADER_SZ; *sslBytes -= HANDSHAKE_HEADER_SZ;
startBytes = *sslBytes;
if (*sslBytes < size) { if (*sslBytes < size) {
Trace(SPLIT_HANDSHAKE_MSG_STR); Trace(SPLIT_HANDSHAKE_MSG_STR);
@ -3666,6 +3670,8 @@ exit:
} }
#endif #endif
*sslBytes = startBytes - size; /* actual bytes of full process */
return ret; return ret;
} }
@ -4933,18 +4939,21 @@ doPart:
switch ((enum ContentType)rh.type) { switch ((enum ContentType)rh.type) {
case handshake: case handshake:
{ {
int inOutIdx = sslBytes; int startIdx = sslBytes;
int used;
Trace(GOT_HANDSHAKE_STR); Trace(GOT_HANDSHAKE_STR);
ret = DoHandShake(sslFrame, &inOutIdx, session, error, rhSize); ret = DoHandShake(sslFrame, &sslBytes, session, error, rhSize);
if (ret != 0) { if (ret != 0 || sslBytes > startIdx) {
if (session->flags.fatalError == 0) if (session->flags.fatalError == 0)
SetError(BAD_HANDSHAKE_STR, error, session, SetError(BAD_HANDSHAKE_STR, error, session,
FATAL_ERROR_STATE); FATAL_ERROR_STATE);
return -1; return -1;
} }
sslFrame += rhSize; /* DoHandShake now fully decrements sslBytes to remaining */
sslBytes -= rhSize; used = startIdx - sslBytes;
sslFrame += used;
if (decrypted) if (decrypted)
sslFrame += ssl->keys.padSz; sslFrame += ssl->keys.padSz;
} }