ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-11 03:31:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

openssl_certificate_info, openssl_csr: fix wrong exception, and little refactoring (#54922)

Browse source 
* Fix wrong exception name.

* Use crypto_utils.load_certificate_request() to load CSRs with both backends.
This commit is contained in:
Felix Fontein 2019-04-05 22:18:30 +02:00 • committed by ansibot
parent dafdcf286a
commit c5991b970f
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/crypto/openssl_csr.py
View file

@ -632,7 +632,7 @@ class CertificateSigningRequestPyOpenSSL(CertificateSigningRequestBase):
return False
try:
csr = crypto_utils.load_certificate_request(self.path)
csr = crypto_utils.load_certificate_request(self.path, backend='pyopenssl')
except Exception as dummy:
return False
@ -819,8 +819,7 @@ class CertificateSigningRequestCryptography(CertificateSigningRequestBase):
return key_a == key_b
try:
with open(self.path, 'rb') as f:
csr = cryptography.x509.load_pem_x509_csr(f.read(), self.cryptography_backend)
csr = crypto_utils.load_certificate_request(self.path, backend='cryptography')
except Exception as dummy:
return False