tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Test for OPENSSL_init_crypto before using.

Browse Source 
Check for the presence of OPENSSL_init_crypto and all the flags we want
before trying to use it (bz#2931).
This commit is contained in:
Darren Tucker 2018-11-16 14:11:44 +11:00
parent 6010c0303a
commit d0d1dfa55b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -2710,6 +2710,7 @@ if test "x$openssl" = "xyes" ; then
]) ])
# LibreSSL/OpenSSL 1.1x API # LibreSSL/OpenSSL 1.1x API
AC_CHECK_FUNCS([ \ AC_CHECK_FUNCS([ \
OPENSSL_init_crypto \
DH_get0_key \ DH_get0_key \
DH_get0_pqg \ DH_get0_pqg \
DH_set0_key \ DH_set0_key \

9
openbsd-compat/openssl-compat.c
View File

@ -76,11 +76,14 @@ ssh_OpenSSL_add_all_algorithms(void)
ENGINE_load_builtin_engines(); ENGINE_load_builtin_engines();
ENGINE_register_all_complete(); ENGINE_register_all_complete();
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if defined(HAVE_OPENSSL_INIT_CRYPTO) && \
OPENSSL_config(NULL); defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \
#else defined(OPENSSL_INIT_ADD_ALL_DIGESTS) && \
defined(OPENSSL_INIT_LOAD_CONFIG)
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL); OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL);
#else
OPENSSL_config(NULL);
#endif #endif
} }
#endif #endif