diff options
| author | Rob Austein <sra@hactrn.net> | 2012-09-20 20:31:33 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2012-09-20 20:31:33 +0000 |
| commit | eda25695e840b8fb1647176a76ae6811da35f127 (patch) | |
| tree | 6bfa7625dcef2b412524d0b2fef4bf7edb8a826e /scripts/format-application-x-rpki.py | |
| parent | fca8631b6454f442ea94b2f81ff61285fb9285ee (diff) | |
Whack rest of POW's object I/O (x.derRead(), x.derWrite()) to use new
class-based methods instead of old module functions.
svn path=/branches/tk274/; revision=4728
Diffstat (limited to 'scripts/format-application-x-rpki.py')
| -rw-r--r-- | scripts/format-application-x-rpki.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/format-application-x-rpki.py b/scripts/format-application-x-rpki.py index a7e58f49..accefa7f 100644 --- a/scripts/format-application-x-rpki.py +++ b/scripts/format-application-x-rpki.py @@ -56,7 +56,7 @@ if argv or source_name is None or destination_name is None: usage(ok = False) def pprint_cert(b64): - return rpki.POW.derRead(rpki.POW.X509_CERTIFICATE, base64.b64decode(b64)).pprint() + return rpki.POW.X509.derRead(base64.b64decode(b64)).pprint() def up_down(): msg["X-RPKI-Up-Down-Type"] = xml.get("type") @@ -101,7 +101,7 @@ try: continue assert not srcmsg.is_multipart() and srcmsg.get_content_type() == "application/x-rpki" payload = srcmsg.get_payload(decode = True) - cms = rpki.POW.derRead(rpki.POW.CMS_MESSAGE, payload) + cms = rpki.POW.CMS.derRead(payload) txt = cms.verify(rpki.POW.X509Store(), None, rpki.POW.CMS_NOCRL | rpki.POW.CMS_NO_SIGNER_CERT_VERIFY | rpki.POW.CMS_NO_ATTR_VERIFY | rpki.POW.CMS_NO_CONTENT_VERIFY) xml = lxml.etree.fromstring(txt) tag = xml.tag |