2 files changed, 7 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 53a16c39a..3f7fe2cd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2710,6 +2710,7 @@ if test "x$openssl" = "xyes" ; then
         ])
         # LibreSSL/OpenSSL 1.1x API
         AC_CHECK_FUNCS([ \
+                OPENSSL_init_crypto \
                 DH_get0_key \
                 DH_get0_pqg \
                 DH_set0_key \
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 590b66d16..5ade8f0ba 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -76,11 +76,14 @@ ssh_OpenSSL_add_all_algorithms(void)
         ENGINE_load_builtin_engines();
         ENGINE_register_all_complete();
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-        OPENSSL_config(NULL);
-#else
+#if defined(HAVE_OPENSSL_INIT_CRYPTO) && \
+     defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \
+     defined(OPENSSL_INIT_ADD_ALL_DIGESTS) && \
+     defined(OPENSSL_INIT_LOAD_CONFIG)
         OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
             OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL);
+#else
+        OPENSSL_config(NULL);
 #endif
 }
 #endif