Skip to content

Commit ee71475

Browse files
vzhestkovdwoz
authored andcommitted
Make x509 module compatible with M2Crypto 0.44.0
1 parent 1245edf commit ee71475

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

salt/modules/x509.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
try:
4444
import M2Crypto
4545

46+
# These imports intended to be used from M2Crypto,
47+
# but not loaded by-default with recent M2Crypto version.
48+
from M2Crypto import ASN1, BIO, EVP, RSA, X509, m2 # pylint: disable=unused-import
49+
4650
HAS_M2 = True
4751
except ImportError:
4852
HAS_M2 = False

0 commit comments

Comments
 (0)