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

Sniffer Fix

Browse Source 
Drop a handshake message if it is split across TLS records. The likely
messages dropped are certificate and certificate request, which are
ignored by the sniffer.
This commit is contained in:
John Safranek
2018-11-16 10:53:01 -08:00
parent 7f76af0b36
commit d2989d9f43
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sniffer.c
View File

@@ -245,7 +245,8 @@ static const char* const msgTable[] =
/* 81 */ /* 81 */
"Bad Decrypt Size", "Bad Decrypt Size",
"Extended Master Secret Hash Error" "Extended Master Secret Hash Error",
"Handshake Message Split Across TLS Records"
}; };
@@ -2060,8 +2061,9 @@ static int DoHandShake(const byte* input, int* sslBytes,
startBytes = *sslBytes; startBytes = *sslBytes;
if (*sslBytes < size) { if (*sslBytes < size) {
SetError(HANDSHAKE_INPUT_STR, error, session, FATAL_ERROR_STATE); Trace(SPLIT_HANDSHAKE_MSG_STR);
return -1; *sslBytes = 0;
return ret;
} }
/* A session's arrays are released when the handshake is completed. */ /* A session's arrays are released when the handshake is completed. */

1
wolfssl/sniffer_error.h
View File

@@ -118,6 +118,7 @@
#define BAD_DECRYPT_SIZE 81 #define BAD_DECRYPT_SIZE 81
#define EXTENDED_MASTER_HASH_STR 82 #define EXTENDED_MASTER_HASH_STR 82
#define SPLIT_HANDSHAKE_MSG_STR 83
/* !!!! also add to msgTable in sniffer.c and .rc file !!!! */ /* !!!! also add to msgTable in sniffer.c and .rc file !!!! */

1
wolfssl/sniffer_error.rc
View File

@@ -99,5 +99,6 @@ STRINGTABLE
81, "Bad Decrypt Size" 81, "Bad Decrypt Size"
82, "Extended Master Secret Hash Error" 82, "Extended Master Secret Hash Error"
83, "Handshake Message Split Across TLS Records"
} }