diff options
| author | Rob Austein <sra@hactrn.net> | 2012-11-15 22:13:53 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2012-11-15 22:13:53 +0000 |
| commit | 756fdbe0d7eda1e98663c62bb3e57f2c18e88ee1 (patch) | |
| tree | c0af81a5987e9859d12a0323d0d240f58d8b2f36 /scripts/format-application-x-rpki.py | |
| parent | 713507be1695d8f2f278ab925d58defc58eff2aa (diff) | |
| parent | 11f3b8df179a16ebe1446dab620522ac97e3c327 (diff) | |
Merge tk274 performance work back to trunk. Closes #274.
svn path=/trunk/; revision=4878
Diffstat (limited to 'scripts/format-application-x-rpki.py')
| -rw-r--r-- | scripts/format-application-x-rpki.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/scripts/format-application-x-rpki.py b/scripts/format-application-x-rpki.py index a7e58f49..00a101aa 100644 --- a/scripts/format-application-x-rpki.py +++ b/scripts/format-application-x-rpki.py @@ -6,7 +6,7 @@ format because nmh makes a handy viewer. $Id$ -Copyright (C) 2010 Internet Systems Consortium ("ISC") +Copyright (C) 2010-2012 Internet Systems Consortium ("ISC") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -21,8 +21,18 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ -import email.mime, email.mime.application, email.mime.text, email.mime.multipart, email.utils, email.encoders -import mailbox, rpki.POW, lxml.etree, getopt, sys, base64 +import email.mime +import email.mime.application +import email.mime.text +import email.mime.multipart +import email.utils +import email.encoders +import mailbox +import rpki.POW +import lxml.etree +import getopt +import sys +import base64 source_name = None destination_name = None @@ -56,7 +66,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 +111,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 |