mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 00:45:39 +00:00
Merge remote-tracking branch 'upstream-public/pr/1834' into development
This commit is contained in:
commit
f48163a960
|
@ -5,6 +5,8 @@ mbed TLS ChangeLog (Sorted per branch, date)
|
|||
Bugfix
|
||||
* Fixes an issue with MBEDTLS_CHACHAPOLY_C which would not compile if
|
||||
MBEDTLS_ARC4_C and MBEDTLS_CIPHER_NULL_CIPHER weren't also defined. #1890
|
||||
* Fix a memory leak in ecp_mul_comb() if ecp_precompute_comb() fails.
|
||||
Fix contributed by Espressif Systems.
|
||||
|
||||
= mbed TLS 2.12.0 branch released 2018-07-25
|
||||
|
||||
|
|
|
@ -1446,7 +1446,12 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
|
|||
|
||||
cleanup:
|
||||
|
||||
if( T != NULL && ! p_eq_g )
|
||||
/* There are two cases where T is not stored in grp:
|
||||
* - P != G
|
||||
* - An intermediate operation failed before setting grp->T
|
||||
* In either case, T must be freed.
|
||||
*/
|
||||
if( T != NULL && T != grp->T )
|
||||
{
|
||||
for( i = 0; i < pre_len; i++ )
|
||||
mbedtls_ecp_point_free( &T[i] );
|
||||
|
|
Loading…
Reference in a new issue