commit e374b95fe16019323de4eedc7da6252b8f777058
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Feb 03 00:05:19 2021 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Mon Feb 22 19:24:03 2021 +0100
tree fa51a8c5b15a407f2aa9be68bb306314954108f2
parent d0a46e5c7f4d04e2dc3cc5f2ec175249a7c665a4

Detect and report mutex usage errors in SSL test programs

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

programs/ssl/ssl_test_lib.c

diff --git a/programs/ssl/ssl_test_lib.c b/programs/ssl/ssl_test_lib.c
index 92d1b97..1bb9d61 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 @@
 
 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 );
 }