mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-23 08:35:43 +01:00
Merge pull request #3894 from maroneze/mbedtls-2.7
Backport 2.7: Fix use of uinitialized memory in ssl_parse_encrypted_pms
This commit is contained in:
commit
1562d9c297
@ -3393,6 +3393,12 @@ static int ssl_parse_encrypted_pms( mbedtls_ssl_context *ssl,
|
|||||||
if( ret != 0 )
|
if( ret != 0 )
|
||||||
return( ret );
|
return( ret );
|
||||||
|
|
||||||
|
/* In case of a failure in decryption, peer_pmslen may not have been
|
||||||
|
* initialized, and it is accessed later. The diff will be nonzero anyway,
|
||||||
|
* but it's better to avoid accessing uninitialized memory in any case.
|
||||||
|
*/
|
||||||
|
peer_pmslen = 0;
|
||||||
|
|
||||||
ret = mbedtls_pk_decrypt( mbedtls_ssl_own_key( ssl ), p, len,
|
ret = mbedtls_pk_decrypt( mbedtls_ssl_own_key( ssl ), p, len,
|
||||||
peer_pms, &peer_pmslen,
|
peer_pms, &peer_pmslen,
|
||||||
sizeof( peer_pms ),
|
sizeof( peer_pms ),
|
||||||
|
Loading…
Reference in New Issue
Block a user