Reverse order of OpenSSL init functions.

Try the new init function (OPENSSL_init_crypto) before falling back to
the old one (OpenSSL_add_all_algorithms).

diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index d8c00ebcb3dcd3ed4fed366e1037e9b245f9a823..a37ca61bf2d427b82017dea770feb81d73ad70ed 100644 (file)
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -69,13 +69,13 @@ ssh_compatible_openssl(long headerver, long libver)
 void
 ssh_libcrypto_init(void)
 {
-#if defined(HAVE_OPENSSL_ADD_ALL_ALGORITHMS)
-       OpenSSL_add_all_algorithms();
-#elif defined(HAVE_OPENSSL_INIT_CRYPTO) && \
+#if defined(HAVE_OPENSSL_INIT_CRYPTO) && \
       defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \
       defined(OPENSSL_INIT_ADD_ALL_DIGESTS)
        OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
            OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+#elif defined(HAVE_OPENSSL_ADD_ALL_ALGORITHMS)
+       OpenSSL_add_all_algorithms();
 #endif
 
 #ifdef USE_OPENSSL_ENGINE