From e374b95fe16019323de4eedc7da6252b8f777058 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 3 Feb 2021 00:05:19 +0100 Subject: [PATCH] Detect and report mutex usage errors in SSL test programs Signed-off-by: Gilles Peskine --- programs/ssl/ssl_test_lib.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/programs/ssl/ssl_test_lib.c b/programs/ssl/ssl_test_lib.c index 92d1b9758..1bb9d6162 100644 --- a/programs/ssl/ssl_test_lib.c +++ b/programs/ssl/ssl_test_lib.c @@ -22,6 +22,10 @@ #include "ssl_test_lib.h" +#if defined(MBEDTLS_TEST_HOOKS) +#include "test/helpers.h" +#endif + #if !defined(MBEDTLS_SSL_TEST_IMPOSSIBLE) void my_debug( void *ctx, int level, @@ -325,10 +329,22 @@ int idle( mbedtls_net_context *fd, void test_hooks_init( void ) { + mbedtls_test_info_reset( ); + +#if defined(MBEDTLS_TEST_MUTEX_USAGE) + mbedtls_test_mutex_usage_init( ); +#endif } int test_hooks_failure_detected( void ) { +#if defined(MBEDTLS_TEST_MUTEX_USAGE) + /* Errors are reported via mbedtls_test_info. */ + mbedtls_test_mutex_usage_check( ); +#endif + + if( mbedtls_test_info.result != MBEDTLS_TEST_RESULT_SUCCESS ) + return( 1 ); return( 0 ); }