diff options
| author | Rob Austein <sra@hactrn.net> | 2010-09-10 02:57:34 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-09-10 02:57:34 +0000 |
| commit | 444389ab7c099b5f2dc663bc10d2f9992bd4afeb (patch) | |
| tree | 44ea6eeb4a625d842e71266e7ff0a7249c0239a0 /rpkid/irdbd.py | |
| parent | 3eeab24a534366dfcdc560d58a0a060c04e7c51e (diff) | |
Refactor .wrap()/.unwrap() code prior to adding CMS timestamp checks.
svn path=/rpkid/irdbd.py; revision=3445
Diffstat (limited to 'rpkid/irdbd.py')
| -rw-r--r-- | rpkid/irdbd.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py index f7724d89..805166dc 100644 --- a/rpkid/irdbd.py +++ b/rpkid/irdbd.py @@ -125,7 +125,7 @@ def handler(query, path, cb): try: - q_msg = rpki.left_right.cms_msg.unwrap(query, (bpki_ta, rpkid_cert)) + q_msg = rpki.left_right.cms_msg(DER = query).unwrap((bpki_ta, rpkid_cert)) if not isinstance(q_msg, rpki.left_right.msg) or not q_msg.is_query(): raise rpki.exceptions.BadQuery, "Unexpected %r PDU" % q_msg @@ -151,7 +151,7 @@ def handler(query, path, cb): rpki.log.traceback() r_msg.append(rpki.left_right.report_error_elt.from_exception(data)) - cb(200, rpki.left_right.cms_msg.wrap(r_msg, irdbd_key, irdbd_cert)) + cb(200, rpki.left_right.cms_msg().wrap(r_msg, irdbd_key, irdbd_cert)) except (rpki.async.ExitNow, SystemExit): raise |