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

use certificate_key throughout

Browse source
This commit is contained in:
James Kasten 2015-05-05 14:43:00 -07:00
parent 73679a4e85
commit 394e18c4c6
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
letsencrypt/client/client.py
View file

@ -124,11 +124,10 @@ class Client(object):
authzr = self.auth_handler.get_authorizations(domains)
# Create CSR from names
if csr is None:
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)
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(
@ -143,7 +142,7 @@ class Client(object):
revoker.Revoker.store_cert_key(
cert_file, self.account.key.file, self.config)
return cert_file, chain_file
return cert_key, cert_file, chain_file
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)