mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow sniffer muliple msgs per record to handle encrypted msgs too

Browse Source
This commit is contained in:
toddouska 2014-12-03 14:12:13 -08:00
parent 264e180147
commit d552390b39
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sniffer.c
View File

@ -1903,7 +1903,7 @@ static int Decrypt(SSL* ssl, byte* output, const byte* input, word32 sz)
/* Decrypt input message into output, adjust output steam if needed */ /* Decrypt input message into output, adjust output steam if needed */
static const byte* DecryptMessage(SSL* ssl, const byte* input, word32 sz, static const byte* DecryptMessage(SSL* ssl, const byte* input, word32 sz,
byte* output, int* error) byte* output, int* error, int* advance)
{ {
int ivExtra = 0; int ivExtra = 0;
@ -1916,6 +1916,7 @@ static const byte* DecryptMessage(SSL* ssl, const byte* input, word32 sz,
if (ssl->options.tls1_1 && ssl->specs.cipher_type == block) { if (ssl->options.tls1_1 && ssl->specs.cipher_type == block) {
output += ssl->specs.block_size; /* go past TLSv1.1 IV */ output += ssl->specs.block_size; /* go past TLSv1.1 IV */
ivExtra = ssl->specs.block_size; ivExtra = ssl->specs.block_size;
*advance = ssl->specs.block_size;
} }
ssl->keys.padSz = ssl->specs.hash_size; ssl->keys.padSz = ssl->specs.hash_size;
@ -2640,6 +2641,7 @@ static int ProcessMessage(const byte* sslFrame, SnifferSession* session,
int errCode = 0; int errCode = 0;
int decoded = 0; /* bytes stored for user in data */ int decoded = 0; /* bytes stored for user in data */
int notEnough; /* notEnough bytes yet flag */ int notEnough; /* notEnough bytes yet flag */
int decrypted = 0; /* was current msg decrypted */
SSL* ssl = (session->flags.side == CYASSL_SERVER_END) ? SSL* ssl = (session->flags.side == CYASSL_SERVER_END) ?
session->sslServer : session->sslClient; session->sslServer : session->sslClient;
doMessage: doMessage:
@ -2685,6 +2687,7 @@ doMessage:
session->flags.serverCipherOn) session->flags.serverCipherOn)
|| (session->flags.side == CYASSL_CLIENT_END && || (session->flags.side == CYASSL_CLIENT_END &&
session->flags.clientCipherOn)) { session->flags.clientCipherOn)) {
int ivAdvance = 0; /* TLSv1.1 advance amount */
if (ssl->decrypt.setup != 1) { if (ssl->decrypt.setup != 1) {
SetError(DECRYPT_KEYS_NOT_SETUP, error, session, FATAL_ERROR_STATE); SetError(DECRYPT_KEYS_NOT_SETUP, error, session, FATAL_ERROR_STATE);
return -1; return -1;
@ -2694,7 +2697,11 @@ doMessage:
return -1; return -1;
} }
sslFrame = DecryptMessage(ssl, sslFrame, rhSize, sslFrame = DecryptMessage(ssl, sslFrame, rhSize,
ssl->buffers.outputBuffer.buffer, &errCode); ssl->buffers.outputBuffer.buffer, &errCode,
&ivAdvance);
recordEnd = sslFrame - ivAdvance + rhSize; /* sslFrame moved so
should recordEnd */
decrypted = 1;
if (errCode != 0) { if (errCode != 0) {
SetError(BAD_DECRYPT, error, session, FATAL_ERROR_STATE); SetError(BAD_DECRYPT, error, session, FATAL_ERROR_STATE);
return -1; return -1;
@ -2721,6 +2728,8 @@ doPart:
/* DoHandShake now fully decrements sslBytes to remaining */ /* DoHandShake now fully decrements sslBytes to remaining */
used = startIdx - sslBytes; used = startIdx - sslBytes;
sslFrame += used; sslFrame += used;
if (decrypted)
sslFrame += ssl->keys.padSz;
} }
break; break;
case change_cipher_spec: case change_cipher_spec: