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 #52842 from s0undt3ch/2019.2.1

Browse source 
`libcrypto.OpenSSL_version_num` might be a callable
This commit is contained in:
Gareth J. Greenaway 2019-05-06 10:00:36 -07:00 • committed by GitHub
commit cc7a0d1326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/rsax931.py
View file

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