Fix ENGINE support with OpenSSL 1.1+

Commit 373c7969485 ("OpenSSL: Fix compile with OpenSSL 1.1.0 and
deprecated APIs") removed a call to ENGINE_load_dynamic() for newer
versions of OpenSSL, asserting that it should happen automatically.

That appears not to be the case, and loading engines now fails because
the dynamic engine isn't present.

Fix it by calling ENGINE_load_builtin_engines(), which works for all
versions of OpenSSL. Also remove the call to ERR_load_ENGINE_strings()
because that should have happened when SSL_load_error_strings() is
called anyway.

Fixes: 373c79694859 ("OpenSSL: Fix compile with OpenSSL 1.1.0 and deprecated APIs")
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index b0c23ae6c9b1f51def69fe19104226cb732b42ca..e5a025996ee08ea30f80e01e935bf69f49231f77 100644 (file)
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1071,11 +1071,8 @@ void * tls_init(const struct tls_config *conf)
        }
 
 #ifndef OPENSSL_NO_ENGINE
-       wpa_printf(MSG_DEBUG, "ENGINE: Loading dynamic engine");
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-       ERR_load_ENGINE_strings();
-       ENGINE_load_dynamic();
-#endif /* OPENSSL_VERSION_NUMBER */
+       wpa_printf(MSG_DEBUG, "ENGINE: Loading builtin engines");
+       ENGINE_load_builtin_engines();
 
        if (conf &&
            (conf->opensc_engine_path || conf->pkcs11_engine_path ||