From d0a46e5c7f4d04e2dc3cc5f2ec175249a7c665a4 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 3 Feb 2021 00:03:03 +0100 Subject: [PATCH] ssl_server2: don't check test hooks failure in query_config mode Test hook failure checks may print information to stdout, which messes up the usage of query_config mode. Nothing interesting happens in query_config mode anyway, so that's no loss. Signed-off-by: Gilles Peskine --- programs/ssl/ssl_server2.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index c04f47a71..293c30b10 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -4000,11 +4000,17 @@ exit: mbedtls_free( context_buf ); #endif - if( test_hooks_failure_detected( ) ) + /* 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. */ + if( opt.query_config_mode == DFL_QUERY_CONFIG_MODE ) { - if( ret == 0 ) - ret = 1; - mbedtls_printf( "Test hooks detected errors.\n" ); + if( test_hooks_failure_detected( ) ) + { + if( ret == 0 ) + ret = 1; + mbedtls_printf( "Test hooks detected errors.\n" ); + } } test_hooks_free( );