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

Merge remote-tracking branch 'public/pr/2070' into development-proposed

Browse source
This commit is contained in:
Simon Butcher 2018-10-28 16:53:48 +00:00
parent 17a0fab345 abe6003f5a
commit b4e5451326
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -13,6 +13,10 @@ Features
yet), and to existing functions in ECDH and SSL (currently only yet), and to existing functions in ECDH and SSL (currently only
implemented client-side, for ECDHE-ECDSA ciphersuites in TLS 1.2, implemented client-side, for ECDHE-ECDSA ciphersuites in TLS 1.2,
including client authentication). including client authentication).
* Fix wrong order of freeing in programs/ssl/ssl_server2 example
application leading to a memory leak in case both
MBEDTLS_MEMORY_BUFFER_ALLOC_C and MBEDTLS_MEMORY_BACKTRACE are set.
Fixes #2069.
Bugfix Bugfix
* Fix a bug in the update function for SSL ticket keys which previously * Fix a bug in the update function for SSL ticket keys which previously

3
programs/ssl/ssl_server2.c
View file

@ -3146,6 +3146,8 @@ exit:
mbedtls_ssl_cookie_free( &cookie_ctx ); mbedtls_ssl_cookie_free( &cookie_ctx );
#endif #endif
mbedtls_free( buf );
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
#if defined(MBEDTLS_MEMORY_DEBUG) #if defined(MBEDTLS_MEMORY_DEBUG)
mbedtls_memory_buffer_alloc_status(); mbedtls_memory_buffer_alloc_status();
@ -3153,7 +3155,6 @@ exit:
mbedtls_memory_buffer_alloc_free(); mbedtls_memory_buffer_alloc_free();
#endif #endif
mbedtls_free( buf );
mbedtls_printf( " done.\n" ); mbedtls_printf( " done.\n" );
#if defined(_WIN32) #if defined(_WIN32)