summaryrefslogtreecommitdiff
path: root/openbsd-compat/openssl-compat.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbsd-compat/openssl-compat.c')
-rw-r--r--openbsd-compat/openssl-compat.c9
1 files changed, 6 insertions, 3 deletions
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)
76 ENGINE_load_builtin_engines(); 76 ENGINE_load_builtin_engines();
77 ENGINE_register_all_complete(); 77 ENGINE_register_all_complete();
78 78
79#if OPENSSL_VERSION_NUMBER < 0x10100000L 79#if defined(HAVE_OPENSSL_INIT_CRYPTO) && \
80 OPENSSL_config(NULL); 80 defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \
81#else 81 defined(OPENSSL_INIT_ADD_ALL_DIGESTS) && \
82 defined(OPENSSL_INIT_LOAD_CONFIG)
82 OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | 83 OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
83 OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL); 84 OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL);
85#else
86 OPENSSL_config(NULL);
84#endif 87#endif
85} 88}
86#endif 89#endif