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

recreate cert on bad password

Browse source
This commit is contained in:
Clint Armstrong 2017-01-30 07:50:59 -05:00
parent 6497094ba7
commit 403000d375
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/x509.py
View file

@ -168,6 +168,10 @@ import salt.utils
# Import 3rd-party libs
import salt.ext.six as six
try:
from M2Crypto.RSA import RSAError
except ImportError:
pass
def __virtual__():
'''
@ -227,7 +231,7 @@ def _check_private_key(name, bits=2048, passphrase=None, new=False):
try:
current_bits = __salt__['x509.get_private_key_size'](
private_key=name, passphrase=passphrase)
except salt.exceptions.SaltInvocationError:
except (salt.exceptions.SaltInvocationError, RSAError):
pass
return current_bits == bits and not new