yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-09 03:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/2072' into mbedtls-2.1-proposed

Browse source
This commit is contained in:
Simon Butcher 2018-10-28 16:58:29 +00:00
parent 351c4f15f4 d6a0ed169f
commit c84f5c937d
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

@ -12,6 +12,10 @@ Bugfix
* Fix a bug in the record decryption routine ssl_decrypt_buf() * Fix a bug in the record decryption routine ssl_decrypt_buf()
which lead to accepting properly authenticated but improperly which lead to accepting properly authenticated but improperly
padded records in case of CBC ciphersuites using Encrypt-then-MAC. padded records in case of CBC ciphersuites using Encrypt-then-MAC.
* 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.
Changes Changes
* "make apidoc" now generates the documentation for the current * "make apidoc" now generates the documentation for the current

3
programs/ssl/ssl_server2.c
View file

@ -2495,6 +2495,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();
@ -2502,7 +2504,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)