upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 07:12:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correct PEM/DER return behavior

Browse source
This commit is contained in:
Seth Schoen 2014-11-24 15:52:48 -08:00
parent 35c34ec6d4
commit c741d969de
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
letsencrypt/client/client.py
View file

@ -70,7 +70,8 @@ class Client(object):
sys.exit(1)
# If CSR and key are provided, the key must be the same key used
# in the CSR.
if self.csr_file and self.key_file and not csr_matches_pubkey(self.csr_file, self.key_file):
if self.csr_file and self.key_file and \
not csr_matches_pubkey(self.csr_file, self.key_file):
logger.fatal("The provided key is not the same key referred to by \
the CSR file")
sys.exit(1)
@ -615,10 +616,8 @@ class Client(object):
def get_key_csr_pem(self, csr_return_format='der'):
"""
Returns key and CSR using provided files or generating new files if
necessary. Both will be saved in pem format on the filesystem.
The CSR can optionally be returned in DER format as the CSR cannot be
loaded back into M2Crypto.
"""
necessary. Both will be saved in PEM format on the filesystem.
The CSR can optionally be returned in DER format."""
key_pem = None
csr_pem = None
if not self.key_file:
@ -647,17 +646,17 @@ class Client(object):
csr_f.close()
logger.info("Creating CSR: %s" % self.csr_file)
else:
# TODO fix this der situation
try:
csr_pem = open(self.csr_file).read().replace("\r", "")
csr = M2Crypto.X509.load_request(self.csr_file)
csr_pem, csr_der = csr.as_pem(), csr.as_der()
except:
logger.fatal("Unable to open CSR file: %s" % self.csr_file)
sys.exit(1)
if csr_return_format == 'der':
return key_pem, csr_der
return key_pem, csr_pem
else:
return key_pem, csr_pem
# def choice_of_ca(self):
# choices = self.get_cas()