wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

openssl_pkcs12: fix crash due to wrong path used for loading key in check mode (#56808)

Browse source 
* Used wrong path for private key.

* Add changelog.

(cherry picked from commit 391a1042c2)
This commit is contained in:
Felix Fontein 2019-05-22 23:34:42 +02:00 committed by Toshio Kuratomi
parent 5f67bd5ef9
commit 6c078e18a8
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/56808-openssl_pkcs12-passphrase-crash.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "openssl_pkcs12 - fixes crash when private key has a passphrase and the module is run a second time."

2
lib/ansible/modules/crypto/openssl_pkcs12.py
View file

@ -227,7 +227,7 @@ class Pkcs(crypto_utils.OpenSSLObject):
def _check_pkey_passphrase():
if self.privatekey_passphrase:
try:
crypto_utils.load_privatekey(self.path,
crypto_utils.load_privatekey(self.privatekey_path,
self.privatekey_passphrase)
except crypto.Error:
return False