wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for TLS v1.1 length sanity check for large messages.

Browse Source
This commit is contained in:
David Garske
2022-06-10 13:35:06 -07:00
parent afc63a3bfa
commit cafe5646b6
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/internal.c
View File

@@ -17793,13 +17793,15 @@ int ProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
case runProcessingOneMessage: case runProcessingOneMessage:
/* can't process a message if we have no data. */ /* can't process a message if we have no data. */
if (ssl->buffers.inputBuffer.idx if (ssl->buffers.inputBuffer.idx
>= ssl->buffers.inputBuffer.length) >= ssl->buffers.inputBuffer.length) {
return BUFFER_ERROR; return BUFFER_ERROR;
}
#if defined(HAVE_ENCRYPT_THEN_MAC) && !defined(WOLFSSL_AEAD_ONLY) #if defined(HAVE_ENCRYPT_THEN_MAC) && !defined(WOLFSSL_AEAD_ONLY)
if (IsEncryptionOn(ssl, 0) && ssl->options.startedETMRead) { if (IsEncryptionOn(ssl, 0) && ssl->options.startedETMRead) {
if ((ssl->curSize - /* For TLS v1.1 the block size and explcit IV are added to idx,
ssl->keys.padSz - * so it needs to be included in this limit check */
if ((ssl->curSize - ssl->keys.padSz -
(ssl->buffers.inputBuffer.idx - startIdx) -
MacSize(ssl) > MAX_PLAINTEXT_SZ) MacSize(ssl) > MAX_PLAINTEXT_SZ)
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
&& ssl->buffers.inputBuffer.length != && ssl->buffers.inputBuffer.length !=
@@ -17816,8 +17818,12 @@ int ProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
else else
#endif #endif
/* TLS13 plaintext limit is checked earlier before decryption */ /* TLS13 plaintext limit is checked earlier before decryption */
/* For TLS v1.1 the block size and explcit IV are added to idx,
* so it needs to be included in this limit check */
if (!IsAtLeastTLSv1_3(ssl->version) if (!IsAtLeastTLSv1_3(ssl->version)
&& ssl->curSize - ssl->keys.padSz > MAX_PLAINTEXT_SZ && ssl->curSize - ssl->keys.padSz -
(ssl->buffers.inputBuffer.idx - startIdx)
> MAX_PLAINTEXT_SZ
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
&& ssl->buffers.inputBuffer.length != && ssl->buffers.inputBuffer.length !=
ssl->buffers.inputBuffer.idx ssl->buffers.inputBuffer.idx