From 60fe6606bf528cee6e4a859c17f35c6ff7b91b9f Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Tue, 16 Feb 2021 18:56:42 +0100 Subject: [PATCH] Only define test_hooks_xxx under MBEDTLS_TEST_HOOKS Signed-off-by: Gilles Peskine --- programs/ssl/ssl_client2.c | 4 ++++ programs/ssl/ssl_server2.c | 4 ++++ programs/ssl/ssl_test_lib.h | 7 ------- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index ef804c964..d0758bcf4 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -734,7 +734,9 @@ int main( int argc, char *argv[] ) mbedtls_memory_buffer_alloc_init( alloc_buf, sizeof(alloc_buf) ); #endif +#if defined(MBEDTLS_TEST_HOOKS) test_hooks_init( ); +#endif /* MBEDTLS_TEST_HOOKS */ /* * Make sure memory references are valid. @@ -3042,6 +3044,7 @@ exit: mbedtls_psa_crypto_free( ); #endif +#if defined(MBEDTLS_TEST_HOOKS) if( test_hooks_failure_detected( ) ) { if( ret == 0 ) @@ -3049,6 +3052,7 @@ exit: mbedtls_printf( "Test hooks detected errors.\n" ); } test_hooks_free( ); +#endif /* MBEDTLS_TEST_HOOKS */ #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #if defined(MBEDTLS_MEMORY_DEBUG) diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 1c68e7634..bd4dbb64b 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -1369,7 +1369,9 @@ int main( int argc, char *argv[] ) #endif /* MBEDTLS_MEMORY_DEBUG */ #endif /* MBEDTLS_MEMORY_BUFFER_ALLOC_C */ +#if defined(MBEDTLS_TEST_HOOKS) test_hooks_init( ); +#endif /* MBEDTLS_TEST_HOOKS */ /* * Make sure memory references are valid in case we exit early. @@ -4004,6 +4006,7 @@ exit: mbedtls_psa_crypto_free( ); #endif +#if defined(MBEDTLS_TEST_HOOKS) /* Let test hooks detect errors such as resource leaks. * Don't do it in query_config mode, because some test code prints * information to stdout and this gets mixed with the regular output. */ @@ -4017,6 +4020,7 @@ exit: } } test_hooks_free( ); +#endif /* MBEDTLS_TEST_HOOKS */ #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #if defined(MBEDTLS_MEMORY_DEBUG) diff --git a/programs/ssl/ssl_test_lib.h b/programs/ssl/ssl_test_lib.h index 2712da67a..98751a0f0 100644 --- a/programs/ssl/ssl_test_lib.h +++ b/programs/ssl/ssl_test_lib.h @@ -288,13 +288,6 @@ int test_hooks_failure_detected( void ); */ void test_hooks_free( void ); -#else /* MBEDTLS_TEST_HOOKS */ - -/* Define macros that do nothing, for convenience. */ -#define test_hooks_init( ) ( (void) 0 ) -#define test_hooks_failure_detected( ) 0 -#define test_hooks_free( ) ( (void) 0 ) - #endif /* !MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_SSL_TEST_IMPOSSIBLE conditions: else */