saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52797 from garethgreenaway/52717_debian_tests_segmentation_fault

Browse source 
[2019.2.1] Only run the libcrypto init if less than OpenSSL 1.1.0
This commit is contained in:
Daniel Wozniak 2019-05-02 22:12:30 -07:00 • committed by GitHub
commit e3918c59f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 < 0x10100000:
libcrypto.OPENSSL_init_crypto()
except AttributeError:
# Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
libcrypto.OPENSSL_no_config()