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

Reverse order of OpenSSL init functions.

Browse Source 
Try the new init function (OPENSSL_init_crypto) before falling back to
the old one (OpenSSL_add_all_algorithms).
This commit is contained in:
Darren Tucker 2018-11-25 14:05:57 +11:00
parent 98f878d227
commit 16fb23f254
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,13 +69,13 @@ ssh_compatible_openssl(long headerver, long libver)
void void
ssh_libcrypto_init(void) ssh_libcrypto_init(void)
{ {
#if defined(HAVE_OPENSSL_ADD_ALL_ALGORITHMS) #if defined(HAVE_OPENSSL_INIT_CRYPTO) && \
OpenSSL_add_all_algorithms();
#elif defined(HAVE_OPENSSL_INIT_CRYPTO) && \
defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \ defined(OPENSSL_INIT_ADD_ALL_CIPHERS) && \
defined(OPENSSL_INIT_ADD_ALL_DIGESTS) defined(OPENSSL_INIT_ADD_ALL_DIGESTS)
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
#elif defined(HAVE_OPENSSL_ADD_ALL_ALGORITHMS)
OpenSSL_add_all_algorithms();
#endif #endif
#ifdef USE_OPENSSL_ENGINE #ifdef USE_OPENSSL_ENGINE