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

fixed bug with handshake defragmentation and ordering

Browse Source
This commit is contained in:
John Safranek
2012-09-17 11:32:36 -07:00
parent 40eb5b3cc5
commit 88bba146ae
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/internal.c
View File

@@ -2567,15 +2567,6 @@ static int DoDtlsHandShakeMsg(CYASSL* ssl, byte* input, word32* inOutIdx,
if (*inOutIdx + fragSz > totalSz) if (*inOutIdx + fragSz > totalSz)
return INCOMPLETE_DATA; return INCOMPLETE_DATA;
if (ssl->keys.dtls_peer_handshake_number ==
ssl->keys.dtls_expected_peer_handshake_number) {
ssl->keys.dtls_expected_peer_handshake_number++;
}
else {
*inOutIdx += size;
return 0;
}
if (fragSz < size) { if (fragSz < size) {
/* message is fragmented, knit back together */ /* message is fragmented, knit back together */
byte* buf = ssl->buffers.dtlsHandshake.buffer; byte* buf = ssl->buffers.dtlsHandshake.buffer;
@@ -2609,18 +2600,34 @@ static int DoDtlsHandShakeMsg(CYASSL* ssl, byte* input, word32* inOutIdx,
*inOutIdx += fragSz; *inOutIdx += fragSz;
if (ssl->buffers.dtlsUsed != size) { if (ssl->buffers.dtlsUsed != size) {
CYASSL_LEAVE("DoDtlsHandShakeMsg()", 1); CYASSL_LEAVE("DoDtlsHandShakeMsg()", 0);
return 0; return 0;
} }
else { else {
if (ssl->keys.dtls_peer_handshake_number ==
ssl->keys.dtls_expected_peer_handshake_number) {
word32 idx = 0; word32 idx = 0;
totalSz = size; totalSz = size;
ssl->keys.dtls_expected_peer_handshake_number++;
ret = DoHandShakeMsgType(ssl, buf, &idx, type, size, totalSz); ret = DoHandShakeMsgType(ssl, buf, &idx, type, size, totalSz);
} }
else {
*inOutIdx += size;
ret = 0;
} }
else }
}
else {
if (ssl->keys.dtls_peer_handshake_number ==
ssl->keys.dtls_expected_peer_handshake_number) {
ssl->keys.dtls_expected_peer_handshake_number++;
ret = DoHandShakeMsgType(ssl, input, inOutIdx, type, size, totalSz); ret = DoHandShakeMsgType(ssl, input, inOutIdx, type, size, totalSz);
}
else {
*inOutIdx += size;
ret = 0;
}
}
if (ssl->buffers.dtlsHandshake.buffer != NULL) { if (ssl->buffers.dtlsHandshake.buffer != NULL) {
XFREE(ssl->buffers.dtlsHandshake.buffer, ssl->heap, DYNAMIC_TYPE_NONE); XFREE(ssl->buffers.dtlsHandshake.buffer, ssl->heap, DYNAMIC_TYPE_NONE);