From 5800ba761052894145abe7a74a1159df007b6875 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 16 Jul 2019 12:21:47 +0200 Subject: [PATCH] test/enginetest.c: Make sure no config file is loaded If a config file gets loaded, the tests get disturbed. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9393) --- test/enginetest.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/enginetest.c b/test/enginetest.c index b4d117efa2..9957f59dc3 100644 --- a/test/enginetest.c +++ b/test/enginetest.c @@ -121,8 +121,12 @@ static int test_engines(void) display_engine_list(); /* - * Depending on whether there's any hardware support compiled in, this - * remove may be destined to fail. + * At this point, we should have an empty list, unless some hardware + * support engine got added. However, since we don't allow the config + * file to be loaded and don't otherwise load any built in engines, + * that is unlikely. Still, we check, if for nothing else, then to + * notify that something is a little off (and might mean that |new_h1| + * wasn't unloaded when it should have) */ if ((ptr = ENGINE_get_first()) != NULL) { if (!ENGINE_remove(ptr)) @@ -347,6 +351,15 @@ static int test_redirect(void) } #endif +int global_init(void) +{ + /* + * If the config file gets loaded, the dynamic engine will be loaded, + * and that interferes with our test above. + */ + return OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG, NULL); +} + int setup_tests(void) { #ifdef OPENSSL_NO_ENGINE -- 2.25.1