Merge pull request #3131 from JacobBarthelmeh/Testing

add sanity check on padSz
pull/2713/head^2
toddouska 2020-07-22 16:39:27 -07:00 committed by GitHub
commit d75e6d4f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions

View File

@ -15327,6 +15327,13 @@ int ProcessReply(WOLFSSL* ssl)
if (ssl->options.tls1_3) {
word16 i = (word16)(ssl->buffers.inputBuffer.length -
ssl->keys.padSz);
/* sanity check on underflow */
if (ssl->keys.padSz >= ssl->buffers.inputBuffer.length) {
WOLFSSL_ERROR(DECRYPT_ERROR);
return DECRYPT_ERROR;
}
/* Remove padding from end of plain text. */
for (--i; i > ssl->buffers.inputBuffer.idx; i--) {
if (ssl->buffers.inputBuffer.buffer[i] != 0)