aboutsummaryrefslogtreecommitdiff
path: root/rpkid/pubd.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2010-09-10 02:57:34 +0000
committerRob Austein <sra@hactrn.net>2010-09-10 02:57:34 +0000
commit444389ab7c099b5f2dc663bc10d2f9992bd4afeb (patch)
tree44ea6eeb4a625d842e71266e7ff0a7249c0239a0 /rpkid/pubd.py
parent3eeab24a534366dfcdc560d58a0a060c04e7c51e (diff)
Refactor .wrap()/.unwrap() code prior to adding CMS timestamp checks.
svn path=/rpkid/irdbd.py; revision=3445
Diffstat (limited to 'rpkid/pubd.py')
-rw-r--r--rpkid/pubd.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/pubd.py b/rpkid/pubd.py
index a9ddca6b..ecb9446b 100644
--- a/rpkid/pubd.py
+++ b/rpkid/pubd.py
@@ -70,11 +70,11 @@ class pubd_context(object):
"""
def done(r_msg):
- reply = rpki.publication.cms_msg.wrap(r_msg, self.pubd_key, self.pubd_cert, crl)
+ reply = rpki.publication.cms_msg().wrap(r_msg, self.pubd_key, self.pubd_cert, crl)
self.sql.sweep()
cb(reply)
- q_msg = rpki.publication.cms_msg.unwrap(query, certs)
+ q_msg = rpki.publication.cms_msg(DER = query).unwrap(certs)
q_msg.serve_top_level(self, client, done)
def control_handler(self, query, path, cb):