diff --git a/examples/restified.py b/examples/restified.py index 1a11bf783..1428c96cc 100644 --- a/examples/restified.py +++ b/examples/restified.py @@ -2,6 +2,8 @@ import logging import os import pkg_resources +import M2Crypto + from letsencrypt.acme import messages2 from letsencrypt.acme import jose @@ -26,7 +28,10 @@ logging.debug(regr) authzr = net.request_challenges( identifier=messages2.Identifier( - typ=messages2.IdentifierFQDN, value="example1.com"), + typ=messages2.IdentifierFQDN, value='example1.com'), regr=regr) +logging.debug(authzr) -print authzr +csr = M2Crypto.X509.load_request_string(pkg_resources.resource_string( + 'letsencrypt.client.tests', os.path.join('testdata', 'csr.pem'))) +net.request_issuance(csr, (authzr,)) diff --git a/letsencrypt/client/network2.py b/letsencrypt/client/network2.py index d927ecede..b2bfb8220 100644 --- a/letsencrypt/client/network2.py +++ b/letsencrypt/client/network2.py @@ -4,6 +4,8 @@ import logging import requests +import M2Crypto + from letsencrypt.acme import jose from letsencrypt.acme import messages2 @@ -179,7 +181,8 @@ class Network(object): :param authzrs: `list` of `.AuthorizationResource` """ - req = CertificateRequest( + # TODO: assert len(authzrs) == number of SANs + req = messages2.CertificateRequest( csr=csr, authorizations=tuple(authzr.uri for authzr in authzrs)) response = self._post( authzrs[0].new_cert_uri, # TODO: acme-spec #90 @@ -187,7 +190,7 @@ class Network(object): # assert content-type: application/pkix-cert return messages2.CertificateResource( authzrs=authzrs, - body=M2Crypto.X509.load_der_string(response.text), + body=M2Crypto.X509.load_cert_der_string(response.text), cert_chain_uri=response.links['up']['url']) def poll_and_request_issuance(self, csr, authzrs, mintime=5):