Revert "Modify test/afalgtest to fail if the afalg engine couldn't be loaded"
authorRichard Levitte <levitte@openssl.org>
Wed, 7 Feb 2018 21:18:44 +0000 (22:18 +0100)
committerRichard Levitte <levitte@openssl.org>
Wed, 7 Feb 2018 21:18:44 +0000 (22:18 +0100)
It turns out that even if you successfully build the engine, it might
not load properly, so we cannot make the test program fail for it.

See the message in commit 25b9d11c002e5c71840c2a6733c5009d78f2c9db

This reverts commit 227a1e3f45bf06fdb00f2bdfb922f6f0d1f1d1de.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5276)

test/afalgtest.c

index bf90545..adb2977 100644 (file)
@@ -128,14 +128,14 @@ int global_init(void)
 int setup_tests(void)
 {
 #ifndef OPENSSL_NO_ENGINE
-    if (!TEST_ptr(e = ENGINE_by_id("afalg"))) {
+    if ((e = ENGINE_by_id("afalg")) == NULL) {
         /* Probably a platform env issue, not a test failure. */
-        TEST_info("Can't load AFALG engine, you might want to check $OPENSSL_ENGINES");
-        return 0;
-    }
+        TEST_info("Can't load AFALG engine");
+    } else {
 # ifndef OPENSSL_NO_AFALGENG
-    ADD_ALL_TESTS(test_afalg_aes_cbc, 3);
+        ADD_ALL_TESTS(test_afalg_aes_cbc, 3);
 # endif
+    }
 #endif
 
     return 1;