diff options
author | Colin Watson <cjwatson@debian.org> | 2018-10-19 21:29:01 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-10-20 22:54:15 +0100 |
commit | d80ebbf028196b2478beebf5a290b97f35e1eed9 (patch) | |
tree | 6666a5484923a26738675ff27a6186cfe15d4cad /openbsd-compat/openssl-compat.c | |
parent | 4f5bbf3f11efeec65bbd56464b20a19bd250e5cc (diff) | |
parent | 1d2a55436d4b556269f42ad5f7e16608b5a8ed74 (diff) |
New upstream release (7.9p1)
Diffstat (limited to 'openbsd-compat/openssl-compat.c')
-rw-r--r-- | openbsd-compat/openssl-compat.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index aaa953f2d..ea0b0c9fb 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -75,7 +75,13 @@ ssh_OpenSSL_add_all_algorithms(void) | |||
75 | /* Enable use of crypto hardware */ | 75 | /* Enable use of crypto hardware */ |
76 | ENGINE_load_builtin_engines(); | 76 | ENGINE_load_builtin_engines(); |
77 | ENGINE_register_all_complete(); | 77 | ENGINE_register_all_complete(); |
78 | |||
79 | #if OPENSSL_VERSION_NUMBER < 0x10001000L | ||
78 | OPENSSL_config(NULL); | 80 | OPENSSL_config(NULL); |
81 | #else | ||
82 | OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | | ||
83 | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL); | ||
84 | #endif | ||
79 | } | 85 | } |
80 | #endif | 86 | #endif |
81 | 87 | ||