upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #389 from letsencrypt/separate_keys

Browse source 
Separate keys
This commit is contained in:
James Kasten 2015-05-05 18:29:09 -07:00
commit a0b410f460
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
letsencrypt/client/client.py
View file

@ -99,9 +99,7 @@ class Client(object):
:meth:`.register` must be called before :meth:`.obtain_certificate`
.. todo:: This function currently uses the account key for the cert.
This should be changed to an independent key once renewal is sorted
out.
.. todo:: This function does not currently handle csr correctly...
:param set domains: domains to get a certificate
@ -109,8 +107,8 @@ class Client(object):
this CSR can be different than self.authkey
:type csr: :class:`CSR`
:returns: cert_file, chain_file (paths to respective files)
:rtype: `tuple` of `str`
:returns: cert_key, cert_path, chain_path
:rtype: `tuple` of (:class:`letsencrypt.client.le_util.Key`, str, str)
"""
if self.auth_handler is None:
@ -126,9 +124,10 @@ class Client(object):
authzr = self.auth_handler.get_authorizations(domains)
# Create CSR from names
if csr is None:
csr = crypto_util.init_save_csr(
self.account.key, domains, self.config.cert_dir)
cert_key = crypto_util.init_save_key(
self.config.rsa_key_size, self.config.key_dir)
csr = crypto_util.init_save_csr(
cert_key, domains, self.config.cert_dir)
# Retrieve certificate
certr = self.network.request_issuance(
@ -137,13 +136,13 @@ class Client(object):
authzr)
# Save Certificate
cert_file, chain_file = self.save_certificate(
cert_path, chain_path = self.save_certificate(
certr, self.config.cert_path, self.config.chain_path)
revoker.Revoker.store_cert_key(
cert_file, self.account.key.file, self.config)
cert_path, self.account.key.file, self.config)
return cert_file, chain_file
return cert_key, cert_path, chain_path
def save_certificate(self, certr, cert_path, chain_path):
# pylint: disable=no-self-use

4
letsencrypt/scripts/main.py
View file

@ -244,9 +244,9 @@ def main(): # pylint: disable=too-many-branches, too-many-statements
acme.register()
except errors.LetsEncryptClientError:
sys.exit(0)
cert_file, chain_file = acme.obtain_certificate(doms)
cert_key, cert_file, chain_file = acme.obtain_certificate(doms)
if installer is not None and cert_file is not None:
acme.deploy_certificate(doms, acc.key, cert_file, chain_file)
acme.deploy_certificate(doms, cert_key, cert_file, chain_file)
if installer is not None:
acme.enhance_config(doms, args.redirect)