Refactor redundantly redundant XML and CMS handling code.

svn path=/rpkid/irbe-cli.py; revision=1681

1 files changed, 4 insertions, 6 deletions

diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py
index 6570eeb3..49f6079b 100755
--- a/rpkid/irdbd.py
+++ b/rpkid/irdbd.py
@@ -29,9 +29,9 @@ import rpki.exceptions, rpki.left_right, rpki.log, rpki.x509
 
 def handler(query, path):
   try:
-    q_cms = rpki.x509.left_right_pdu(DER = query)
-    q_elt = q_cms.verify(cms_ta)
-    q_msg = rpki.left_right.sax_handler.saxify(q_elt)
+
+    q_msg = rpki.left_right.cms_msg.unwrap(query, cms_ta)
+
     if not isinstance(q_msg, rpki.left_right.msg):
       raise rpki.exceptions.BadQuery, "Unexpected %s PDU" % repr(q_msg)
 
@@ -70,9 +70,7 @@ def handler(query, path):
 
       r_msg.append(r_pdu)
 
-    r_elt = r_msg.toXML()
-    r_cms = rpki.x509.left_right_pdu.build(r_elt, cms_key, cms_certs)
-    return 200, r_cms.get_DER()
+    return 200, rpki.left_right.cms_msg.wrap(r_msg, cms_key, cms_certs)
 
   except Exception, data:
     rpki.log.error(traceback.format_exc())