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

Merge pull request #3837 from haydenroche5/zd11808

Browse Source 
Fix for ZD 11808.
This commit is contained in:
John Safranek
2021-03-24 18:24:04 -07:00
committed by GitHub
parent 08ea90ad94 b271da2954
commit f2f2976e96
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/internal.c
View File

@ -8630,6 +8630,11 @@ static int GetRecordHeader(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
return LENGTH_ERROR; return LENGTH_ERROR;
#endif #endif
if (*size == 0 && rh->type != application_data) {
WOLFSSL_MSG("0 length, non-app data record.");
return LENGTH_ERROR;
}
/* verify record type here as well */ /* verify record type here as well */
switch (rh->type) { switch (rh->type) {
case handshake: case handshake:
@ -15659,7 +15664,7 @@ int ProcessReply(WOLFSSL* ssl)
used = ssl->buffers.inputBuffer.length - used = ssl->buffers.inputBuffer.length -
ssl->buffers.inputBuffer.idx; ssl->buffers.inputBuffer.idx;
if (used < ssl->curSize) if (used < ssl->curSize)
if ((ret = GetInputData(ssl, ssl->curSize)) < 0) if ((ret = GetInputData(ssl, ssl->curSize - used)) < 0)
return ret; return ret;
#endif /* WOLFSSL_DTLS */ #endif /* WOLFSSL_DTLS */
} }
@ -15687,6 +15692,7 @@ int ProcessReply(WOLFSSL* ssl)
ret = GetRecordHeader(ssl, ssl->buffers.inputBuffer.buffer, ret = GetRecordHeader(ssl, ssl->buffers.inputBuffer.buffer,
&ssl->buffers.inputBuffer.idx, &ssl->buffers.inputBuffer.idx,
&ssl->curRL, &ssl->curSize); &ssl->curRL, &ssl->curSize);
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (ssl->options.dtls && ret == SEQUENCE_ERROR) { if (ssl->options.dtls && ret == SEQUENCE_ERROR) {
WOLFSSL_MSG("Silently dropping out of order DTLS message"); WOLFSSL_MSG("Silently dropping out of order DTLS message");
@ -16174,6 +16180,12 @@ int ProcessReply(WOLFSSL* ssl)
#endif #endif
#ifndef WOLFSSL_NO_TLS12 #ifndef WOLFSSL_NO_TLS12
if (ssl->buffers.inputBuffer.idx >=
ssl->buffers.inputBuffer.length ||
ssl->curSize < 1) {
WOLFSSL_MSG("ChangeCipher msg too short");
return LENGTH_ERROR;
}
if (ssl->buffers.inputBuffer.buffer[ if (ssl->buffers.inputBuffer.buffer[
ssl->buffers.inputBuffer.idx] != 1) { ssl->buffers.inputBuffer.idx] != 1) {
WOLFSSL_MSG("ChangeCipher msg wrong value"); WOLFSSL_MSG("ChangeCipher msg wrong value");