yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-06-02 01:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Simon Butcher 2018-05-23 17:53:23 +01:00
parent 753afd85a1 ce52b58da0
commit e64bf3968e
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -70,6 +70,7 @@ Changes
* Improve robustness of mbedtls_ssl_derive_keys against the use of * Improve robustness of mbedtls_ssl_derive_keys against the use of
HMAC functions with non-HMAC ciphersuites. Independently contributed HMAC functions with non-HMAC ciphersuites. Independently contributed
by Jiayuan Chen in #1377. Fixes #1437. by Jiayuan Chen in #1377. Fixes #1437.
* Fix braces in mbedtls_memory_buffer_alloc_status(). Found by sbranden, #552.
= mbed TLS 2.1.11 branch released 2018-03-16 = mbed TLS 2.1.11 branch released 2018-03-16

2
library/memory_buffer_alloc.c
View file

@ -522,7 +522,9 @@ void mbedtls_memory_buffer_alloc_status()
heap.alloc_count, heap.free_count ); heap.alloc_count, heap.free_count );
if( heap.first->next == NULL ) if( heap.first->next == NULL )
{
mbedtls_fprintf( stderr, "All memory de-allocated in stack buffer\n" ); mbedtls_fprintf( stderr, "All memory de-allocated in stack buffer\n" );
}
else else
{ {
mbedtls_fprintf( stderr, "Memory currently allocated:\n" ); mbedtls_fprintf( stderr, "Memory currently allocated:\n" );