valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only run the libcrypto init if less than OpenSSL 1.1.0.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2019-05-02 08:03:57 -07:00
parent 35094653c9
commit e24f2f8f21
No known key found for this signature in database
GPG Key ID: 10B62F8A7CAD7A41
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/rsax931.py
View File

@ -65,7 +65,9 @@ def _init_libcrypto():
libcrypto = _load_libcrypto()
try:
libcrypto.OPENSSL_init_crypto()
# If we're greater than OpenSSL 1.1.0, no need to to the init
if libcrypto.OpenSSL_version_num < 0x10100000L:
libcrypto.OPENSSL_init_crypto()
except AttributeError:
# Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
libcrypto.OPENSSL_no_config()