Merge pull request #22481 from clinta/x509

bad logic in checking for x509 extensions
This commit is contained in:
Justin Findlay 2015-04-08 22:42:47 -06:00
commit 814697a464

View File

@ -1129,7 +1129,7 @@ def create_certificate(path=None, text=False, ca_server=None, **kwargs):
cert.set_issuer(signing_cert.get_subject()) cert.set_issuer(signing_cert.get_subject())
for extname, extlongname in EXT_NAME_MAPPINGS.iteritems(): for extname, extlongname in EXT_NAME_MAPPINGS.iteritems():
if extname not in kwargs or extlongname not in kwargs or extname not in csrexts or extlongname not in csrexts: if (extname in kwargs or extlongname in kwargs or extname in csrexts or extlongname in csrexts) is False:
continue continue
# Use explicitly set values first, fall back to CSR values. # Use explicitly set values first, fall back to CSR values.