crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-01-26 07:41:33 +03:00
Code Activity

Fix TODO encode? in acme.py

Browse Source
This commit is contained in:
Jakub Warmuz
2014-11-24 13:45:15 +01:00
parent 018ebd4087
commit 43ae01b4c8
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
letsencrypt/client/acme.py
View File

@@ -115,8 +115,8 @@ def authorization_request(req_id, name, server_nonce, responses, key_file):
def certificate_request(csr_der, key): def certificate_request(csr_der, key):
"""Create ACME "certificateRequest" message. """Create ACME "certificateRequest" message.
:param csr_der: TODO :param csr_der: DER encoded CSR.
:type csr_der: TODO :type csr_der: str
:param key: TODO :param key: TODO
:type key: TODO :type key: TODO
@@ -127,7 +127,7 @@ def certificate_request(csr_der, key):
""" """
return { return {
"type": "certificateRequest", "type": "certificateRequest",
"csr": le_util.jose_b64encode(csr_der), # TODO: csr_der.encode? "csr": le_util.jose_b64encode(csr_der),
"signature": crypto_util.create_sig(csr_der, key), "signature": crypto_util.create_sig(csr_der, key),
} }
@@ -148,7 +148,7 @@ def revocation_request(key_file, cert_der):
""" """
return { return {
"type": "revocationRequest", "type": "revocationRequest",
"certificate": le_util.jose_b64encode(cert_der), # TODO: csr_der.encode? "certificate": le_util.jose_b64encode(cert_der),
"signature": crypto_util.create_sig(cert_der, key_file), "signature": crypto_util.create_sig(cert_der, key_file),
} }

25
letsencrypt/client/client.py
View File

@@ -161,8 +161,8 @@ class Client(object):
def acme_certificate(self, csr_der): def acme_certificate(self, csr_der):
"""Handle ACME "certificate" phase. """Handle ACME "certificate" phase.
:param csr_der: TODO :param csr_der: CSR in DER format.
:type csr_der: TODO :type csr_der: str
:returns: ACME "certificate" message. :returns: ACME "certificate" message.
:rtype: dict :rtype: dict
@@ -593,11 +593,22 @@ class Client(object):
return challenge_objs, challenge_obj_indices return challenge_objs, challenge_obj_indices
def get_key_csr_pem(self, csr_return_format='der'): def get_key_csr_pem(self, csr_return_format='der'):
""" """Return key and CSR, generate if necessary.
Returns key and CSR using provided files or generating new files if
necessary. Both will be saved in pem format on the filesystem. Returns key and CSR using provided files or generating new files
The CSR can optionally be returned in DER format as the CSR cannot be if necessary. Both will be saved in PEM format on the
loaded back into M2Crypto. filesystem. The CSR can optionally be returned in DER format as
the CSR cannot be loaded back into M2Crypto.
:param csr_return_format: If "der" returned CSR is in DER format,
PEM otherwise.
:param csr_return_format: str
:returns: A pair of `(key, csr)`, where `key` is PEM encoded `str`
and `csr` is PEM/DER (depedning on `csr_return_format`
encoded `str`.
:rtype: tuple
""" """
key_pem = None key_pem = None
csr_pem = None csr_pem = None