Merge remote-tracking branch 'public/pr/1581' into mbedtls-2.7

This commit is contained in:
Simon Butcher 2018-06-14 11:02:43 +01:00
commit 47212c8e2c
2 changed files with 3 additions and 0 deletions

View file

@ -7,6 +7,7 @@ Bugfix
TrinityTonic. #1359.
* Fix for redefinition of _WIN32_WINNT to avoid overriding a definition
used by user applications. Found and fixed by Fabio Alessandrelli.
* Fix braces in mbedtls_memory_buffer_alloc_status(). Found by sbranden, #552.
Changes
* Support TLS testing in out-of-source builds using cmake. Fixes #1193.

View file

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