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

fix quotes and remove dependency on pkg_resources

Browse source
This commit is contained in:
Clint Armstrong 2016-10-18 08:38:41 -04:00
parent eb4433d1ae
commit 9b6f1a336c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/x509.py
View file

@ -19,7 +19,6 @@ import yaml
import re
import datetime
import ast
import pkg_resources
# Import salt libs
import salt.utils
@ -674,7 +673,7 @@ def create_private_key(path=None, text=False, bits=2048):
def create_crl(path=None, text=False, signing_private_key=None,
signing_cert=None, revoked=None, include_expired=False,
days_valid=100, digest=""):
days_valid=100, digest=''):
'''
Create a CRL
@ -780,9 +779,10 @@ def create_crl(path=None, text=False, signing_private_key=None,
key = OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM,
get_pem_entry(signing_private_key))
if digest and pkg_resources.get_distribution("pyopenssl").version >= '0.15':
try:
crltext = crl.export(cert, key, OpenSSL.crypto.FILETYPE_PEM, days=days_valid, digest=bytes(digest))
else:
except TypeError:
log.warning('Error signing crl with specified digest. Are you using pyopenssl 0.15 or newer? The default md5 digest will be used.')
crltext = crl.export(cert, key, OpenSSL.crypto.FILETYPE_PEM, days=days_valid)
if text: