tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid deprecated OPENSSL_config when using 1.1.x 

OpenSSL 1.1.x soft-deprecated OPENSSL_config in favour of
OPENSSL_init_crypto; pointed out by Jakub Jelen
This commit is contained in:
Damien Miller 2018-10-16 10:51:52 +11:00
parent 797cdd9c84
commit 4e23deefd7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,13 @@ ssh_OpenSSL_add_all_algorithms(void)
/* Enable use of crypto hardware */ /* Enable use of crypto hardware */
ENGINE_load_builtin_engines(); ENGINE_load_builtin_engines();
ENGINE_register_all_complete(); ENGINE_register_all_complete();
#if OPENSSL_VERSION_NUMBER < 0x10001000L
OPENSSL_config(NULL); OPENSSL_config(NULL);
#else
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG);
#endif
} }
#endif #endif