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 py3 and ordering inconsistency problems.

Browse source
This commit is contained in:
Joe Julian 2015-05-19 13:50:14 -07:00
parent 493f7ad5f0
commit 30102acd04
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/tls.py
View file

@ -22,6 +22,7 @@ import os
import time
import logging
import hashlib
from salt.ext import six
from salt.ext.six.moves import range
from datetime import datetime
@ -846,14 +847,17 @@ def create_ca_signed_cert(ca_name, CN, days=365, cacert_path=None, digest='sha25
cert.set_issuer(ca_cert.get_subject())
cert.set_pubkey(req.get_pubkey())
extensions_list = []
for name in extensions:
if type(extensions[name]) == dict and extensions[name].keys() == ['critical', 'options']:
log.debug("name: {0}, critical: {1}, options: {2}".format(
name, extensions[name]['critical'], extensions[name]['options']))
for name, edata in six.iteritems(extensions):
if not isinstance(edata, dict):
continue
for opt in ['critical', 'options']:
if opt not in edata:
break
else:
extensions_list.append(OpenSSL.crypto.X509Extension(
name,
extensions[name]['critical'],
extensions[name]['options']))
name,
edata['critical'],
edata['options']))
cert.add_extensions(extensions_list)
cert.sign(ca_key, digest)