mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-02 07:14:22 +01:00
Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted
This commit is contained in:
commit
3b8d82a1aa
@ -129,15 +129,6 @@ do { \
|
|||||||
( mbedtls_timing_hardclock() - tsc ) / ( jj * BUFSIZE ) ); \
|
( mbedtls_timing_hardclock() - tsc ) / ( jj * BUFSIZE ) ); \
|
||||||
} while( 0 )
|
} while( 0 )
|
||||||
|
|
||||||
#if defined(MBEDTLS_ERROR_C)
|
|
||||||
#define PRINT_ERROR \
|
|
||||||
mbedtls_strerror( ret, ( char * )tmp, sizeof( tmp ) ); \
|
|
||||||
mbedtls_printf( "FAILED: %s\n", tmp );
|
|
||||||
#else
|
|
||||||
#define PRINT_ERROR \
|
|
||||||
mbedtls_printf( "FAILED: -0x%04x\n", -ret );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) && defined(MBEDTLS_MEMORY_DEBUG)
|
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) && defined(MBEDTLS_MEMORY_DEBUG)
|
||||||
|
|
||||||
#define MEMORY_MEASURE_INIT \
|
#define MEMORY_MEASURE_INIT \
|
||||||
|
Loading…
Reference in New Issue
Block a user