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

Default to Cryptodome, fallback to PyCrypto

Browse source
This commit is contained in:
Pedro Algarvio 2019-04-17 16:10:47 +01:00
parent b2b0764dd4
commit e6bc9f8e14
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/cloud/clouds/joyent.py
View file

@ -63,9 +63,20 @@ try:
from M2Crypto import EVP
HAS_M2 = True
except ImportError:
from Crypto.Hash import SHA256
from Crypto.Signature import PKCS1_v1_5
HAS_M2 = False
try:
from Cryptodome.Hash import SHA256
from Cryptodome.PublicKey import RSA
from Cryptodome.Signature import PKCS1_v1_5
HAS_REQUIRED_CRYPTO = True
except ImportError:
try:
from Crypto.Hash import SHA256
from Crypto.PublicKey import RSA
from Crypto.Signature import PKCS1_v1_5
HAS_REQUIRED_CRYPTO = True
except ImportError:
HAS_REQUIRED_CRYPTO = False
# Import salt libs
from salt.ext import six
@ -118,6 +129,8 @@ def __virtual__():
'''
Check for Joyent configs
'''
if HAS_REQUIRED_CRYPTO is False:
return False, 'Either PyCrypto or Cryptodome needs to be installed.'
if get_configured_provider() is False:
return False