starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-04 20:32:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify import_csr_file

Browse Source
This commit is contained in:
Brad Warren
2016-05-20 16:26:09 -07:00
parent 73c4e8f7a4
commit 53286863fe
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/crypto_util.py
+12 -17
View File
@@ -180,33 +180,28 @@ def csr_matches_pubkey(csr, privkey):
return False return False
def import_csr_file(csrfile, contents): def import_csr_file(csrfile, data):
"""Import a CSR file, which can be either PEM or DER. """Import a CSR file, which can be either PEM or DER.
:param str csrfile: CSR filename :param str csrfile: CSR filename
:param str contents: contens of the CSR file :param str data: contents of the CSR file
:returns: (le_util.CSR object representing the CSR, :returns: (`OpenSSL.crypto.FILETYPE_PEM` or `OpenSSL.crypto.FILETYPE_ASN1`,
`OpenSSL.crypto.FILETYPE_PEM` or `OpenSSL.crypto.FILETYPE_ASN1`, le_util.CSR object representing the CSR,
list of domains requested in the CSR) list of domains requested in the CSR)
:rtype: tuple :rtype: tuple
""" """
for form, typ in (("der", OpenSSL.crypto.FILETYPE_ASN1,),
("pem", OpenSSL.crypto.FILETYPE_PEM,),):
try: try:
csr = le_util.CSR(file=csrfile, data=contents, form="der") domains = get_names_from_csr(data, typ)
typ = OpenSSL.crypto.FILETYPE_ASN1
domains = get_sans_from_csr(csr.data, OpenSSL.crypto.FILETYPE_ASN1)
except OpenSSL.crypto.Error: except OpenSSL.crypto.Error:
try: logger.debug("CSR parse error (form=%s, typ=%s):", form, typ)
e1 = traceback.format_exc() logger.debug(traceback.format_exc())
typ = OpenSSL.crypto.FILETYPE_PEM continue
csr = le_util.CSR(file=csrfile, data=contents, form="pem") return typ, le_util.CSR(file=csrfile, data=data, form=form), domains
domains = get_sans_from_csr(csr.data, typ)
except OpenSSL.crypto.Error:
logger.debug("DER CSR parse error %s", e1)
logger.debug("PEM CSR parse error %s", traceback.format_exc())
raise errors.Error("Failed to parse CSR file: {0}".format(csrfile)) raise errors.Error("Failed to parse CSR file: {0}".format(csrfile))
return typ, csr, domains
def make_key(bits): def make_key(bits):