Prevent crash if PyOpenSSL cannot be imported because of an Attribute…

…Error.
ansible-collections · Apr 26, 2022 · 3ee18d2 · 3ee18d2
1 parent 9b2199f
commit 3ee18d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/module_utils/crypto/support.py b/plugins/module_utils/crypto/support.py
@@ -32,7 +32,7 @@
 try:
     from OpenSSL import crypto
     HAS_PYOPENSSL = True
-except ImportError:
+except (ImportError, AttributeError):
     # Error handled in the calling module.
     HAS_PYOPENSSL = False
 

diff --git a/plugins/modules/openssl_pkcs12.py b/plugins/modules/openssl_pkcs12.py
@@ -276,7 +276,7 @@
     import OpenSSL
     from OpenSSL import crypto
     PYOPENSSL_VERSION = LooseVersion(OpenSSL.__version__)
-except ImportError:
+except (ImportError, AttributeError):
     PYOPENSSL_IMP_ERR = traceback.format_exc()
     PYOPENSSL_FOUND = False
 else: