yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 12:45:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix false reject in padding check in ssl_decrypt_buf() for CBC ciphersuites

Browse Source 
In case full SSL frames arrived, they were rejected because an overly
strict padding check.
This commit is contained in:
Paul Bakker 2014-04-25 12:59:03 +02:00
parent fdba46885b
commit 61885c7f7f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -11,6 +11,8 @@ Bugfix
* Typos in platform.c and pkcs11.c (found by Daniel Phillips and Steffan * Typos in platform.c and pkcs11.c (found by Daniel Phillips and Steffan
Karger) Karger)
* cert_write app should use subject of issuer certificate as issuer of cert * cert_write app should use subject of issuer certificate as issuer of cert
* Fix false reject in padding check in ssl_decrypt_buf() for CBC
ciphersuites, for full SSL frames of data.
= PolarSSL 1.3.6 released on 2014-04-11 = PolarSSL 1.3.6 released on 2014-04-11

6
library/ssl_tls.c
View File

@ -1633,13 +1633,15 @@ static int ssl_decrypt_buf( ssl_context *ssl )
* Padding is guaranteed to be incorrect if: * Padding is guaranteed to be incorrect if:
* 1. padlen >= ssl->in_msglen * 1. padlen >= ssl->in_msglen
* *
* 2. padding_idx > SSL_MAX_CONTENT_LEN * 2. padding_idx >= SSL_MAX_CONTENT_LEN +
* ssl->transform_in->maclen
* *
* In both cases we reset padding_idx to a safe value (0) to * In both cases we reset padding_idx to a safe value (0) to
* prevent out-of-buffer reads. * prevent out-of-buffer reads.
*/ */
correct &= ( ssl->in_msglen >= padlen + 1 ); correct &= ( ssl->in_msglen >= padlen + 1 );
correct &= ( padding_idx <= SSL_MAX_CONTENT_LEN ); correct &= ( padding_idx < SSL_MAX_CONTENT_LEN +
ssl->transform_in->maclen );
padding_idx *= correct; padding_idx *= correct;