diff options
| author | Rob Austein <sra@hactrn.net> | 2008-04-19 22:52:16 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2008-04-19 22:52:16 +0000 |
| commit | 14f2160b5f9a78c02b8b072930040210220c63cb (patch) | |
| tree | b253a47e66ede9ba68c2bef296836a052044ded4 /rpkid/testbed.py | |
| parent | bd558a26aad5da955c4b59e446837ecab0618be2 (diff) | |
Convert CMS code to something vaguely object-oriented, to simplify
handling of eContentType OIDs, etc. Unifiy some of the redundant XML
processing as method routines.
svn path=/pow/POW-0.7/POW.c; revision=1679
Diffstat (limited to 'rpkid/testbed.py')
| -rw-r--r-- | rpkid/testbed.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 3534b24f..8c689f04 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -568,22 +568,18 @@ class allocation(object): pdu.type = "query" elt = rpki.left_right.msg((pdu,)).toXML() rpki.log.debug(lxml.etree.tostring(elt, pretty_print = True, encoding = "us-ascii")) - rpki.relaxng.left_right.assertValid(elt) - cms = rpki.cms.xml_sign( - elt = elt, - key = testbed_key, - certs = testbed_certs) + cms = rpki.x509.left_right_pdu.build(elt, testbed_key, testbed_certs) url = "https://localhost:%d/left-right" % self.rpki_port rpki.log.debug("Attempting to connect to %s" % url) - cms = rpki.https.client( + der = rpki.https.client( client_key = testbed_key, client_certs = testbed_certs, server_ta = self.rpkid_ta, url = url, - msg = cms) - elt = rpki.cms.xml_verify(der = cms, ta = self.rpkid_ta) + msg = cms.get_DER()) + cms = rpki.x509.left_right_pdu(DER = der) + elt = cms.verify(ta = self.rpkid_ta) rpki.log.debug(lxml.etree.tostring(elt, pretty_print = True, encoding = "us-ascii")) - rpki.relaxng.left_right.assertValid(elt) pdu = rpki.left_right.sax_handler.saxify(elt)[0] assert pdu.type == "reply" and not isinstance(pdu, rpki.left_right.report_error_elt) return pdu |