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/irbe-setup.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/irbe-setup.py')
| -rw-r--r-- | rpkid/irbe-setup.py | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/rpkid/irbe-setup.py b/rpkid/irbe-setup.py index d3170bfa..452aae76 100644 --- a/rpkid/irbe-setup.py +++ b/rpkid/irbe-setup.py @@ -20,7 +20,7 @@ engine for every registrant object in the IRDB. """ import os, MySQLdb, getopt, sys, lxml.etree, lxml.sax -import rpki.left_right, rpki.relaxng, rpki.cms, rpki.https +import rpki.left_right, rpki.relaxng, rpki.https import rpki.x509, rpki.config, rpki.log rpki.log.init("irbe-setup") @@ -48,24 +48,14 @@ def call_rpkid(pdu): pdu.type = "query" msg = rpki.left_right.msg((pdu,)) elt = msg.toXML() - try: - rpki.relaxng.left_right.assertValid(elt) - except lxml.etree.DocumentInvalid: - print lxml.etree.tostring(elt, pretty_print = True, encoding = "us-ascii") - raise - elt = rpki.cms.xml_verify(der = rpki.https.client(client_key = https_key, - client_certs = https_certs, - server_ta = https_ta, - url = https_url, - msg = rpki.cms.xml_sign(elt = elt, - key = cms_key, - certs = cms_certs)), - ta = cms_ta) - try: - rpki.relaxng.left_right.assertValid(elt) - except lxml.etree.DocumentInvalid: - print lxml.etree.tostring(elt, pretty_print = True, encoding = "us-ascii") - raise + cms = rpki.x509.let_right_pdu.build(elt, cms_key, cms_certs) + der = rpki.https.client(client_key = https_key, + client_certs = https_certs, + server_ta = https_ta, + url = https_url, + msg = cms) + cms = rpki.x509.left_right_pdu(DER = der) + elt = cms.verify(cms_ta) msg = rpki.left_right.sax_handler.saxify(elt) pdu = msg[0] assert len(msg) == 1 and pdu.type == "reply" and not isinstance(pdu, rpki.left_right.report_error_elt) |