diff options
author | Darren Tucker <dtucker@dtucker.net> | 2018-11-25 14:05:57 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-11-25 14:05:57 +1100 |
commit | 16fb23f25454991272bfe4598cc05d20fcd25116 (patch) | |
tree | 27ab970cf22ca93bd155703cd1ab8f1623ad47c8 /openbsd-compat/openssl-compat.c | |
parent | 98f878d2272bf8dff21f2a0265d963c29e33fed2 (diff) |
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).
Diffstat (limited to 'openbsd-compat/openssl-compat.c')
-rw-r--r-- | openbsd-compat/openssl-compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index d8c00ebcb..a37ca61bf 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -69,13 +69,13 @@ ssh_compatible_openssl(long headerver, long libver) | |||
69 | void | 69 | void |
70 | ssh_libcrypto_init(void) | 70 | ssh_libcrypto_init(void) |
71 | { | 71 | { |
72 | #if defined(HAVE_OPENSSL_ADD_ALL_ALGORITHMS) | 72 | #if defined(HAVE_OPENSSL_INIT_CRYPTO) && \ |
73 | OpenSSL_add_all_algorithms(); | ||
74 | #elif defined(HAVE_OPENSSL_INIT_CRYPTO) && \ | ||
75 | defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \ | 73 | defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \ |
76 | defined(OPENSSL_INIT_ADD_ALL_DIGESTS) | 74 | defined(OPENSSL_INIT_ADD_ALL_DIGESTS) |
77 | OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | | 75 | OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | |
78 | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); | 76 | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); |
77 | #elif defined(HAVE_OPENSSL_ADD_ALL_ALGORITHMS) | ||
78 | OpenSSL_add_all_algorithms(); | ||
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | #ifdef USE_OPENSSL_ENGINE | 81 | #ifdef USE_OPENSSL_ENGINE |