From 227a1e3f45bf06fdb00f2bdfb922f6f0d1f1d1de Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 7 Feb 2018 14:01:13 +0100 Subject: [PATCH] Modify test/afalgtest to fail if the afalg engine couldn't be loaded If you know that there's no afalg engine, don't run this test. test/recipes/30-test_afalg.t checks this correctly. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5270) --- test/afalgtest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/afalgtest.c b/test/afalgtest.c index adb2977f30..bf9054554a 100644 --- a/test/afalgtest.c +++ b/test/afalgtest.c @@ -128,14 +128,14 @@ int global_init(void) int setup_tests(void) { #ifndef OPENSSL_NO_ENGINE - if ((e = ENGINE_by_id("afalg")) == NULL) { + if (!TEST_ptr(e = ENGINE_by_id("afalg"))) { /* Probably a platform env issue, not a test failure. */ - TEST_info("Can't load AFALG engine"); - } else { + TEST_info("Can't load AFALG engine, you might want to check $OPENSSL_ENGINES"); + return 0; + } # ifndef OPENSSL_NO_AFALGENG - ADD_ALL_TESTS(test_afalg_aes_cbc, 3); + ADD_ALL_TESTS(test_afalg_aes_cbc, 3); # endif - } #endif return 1; -- 2.25.1