Merge remote-tracking branch 'public/pr/1182' into development

This commit is contained in:
Simon Butcher 2018-06-14 10:33:29 +01:00
commit 6ac1cf6f5f
2 changed files with 3 additions and 0 deletions

View file

@ -38,6 +38,7 @@ API Changes
Bugfix Bugfix
* Fix an issue with MicroBlaze support in bn_mul.h which was causing the * Fix an issue with MicroBlaze support in bn_mul.h which was causing the
build to fail. Found by zv-io. Fixes #1651. build to fail. Found by zv-io. Fixes #1651.
* Fix braces in mbedtls_memory_buffer_alloc_status(). Found by sbranden, #552.
Changes Changes
* Support TLS testing in out-of-source builds using cmake. Fixes #1193. * Support TLS testing in out-of-source builds using cmake. Fixes #1193.

View file

@ -518,7 +518,9 @@ void mbedtls_memory_buffer_alloc_status( void )
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" );