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/x509-dot.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/x509-dot.py')
| -rw-r--r-- | scripts/x509-dot.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/x509-dot.py b/scripts/x509-dot.py index 9ad5b79d..c820018e 100644 --- a/scripts/x509-dot.py +++ b/scripts/x509-dot.py @@ -3,7 +3,7 @@ """ Generate .dot description of a certificate tree. -Copyright (C) 2009-2011 Internet Systems Consortium ("ISC") +Copyright (C) 2009-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 @@ -61,9 +61,9 @@ class x509(object): f.close() if "-----BEGIN" in text: - self.pow = rpki.POW.pemRead(rpki.POW.X509_CERTIFICATE, text) + self.pow = rpki.POW.X509.pemRead(text) else: - self.pow = rpki.POW.derRead(rpki.POW.X509_CERTIFICATE, text) + self.pow = rpki.POW.X509.derRead(text) self.extensions = dict((e[0], e[2]) for e in (self.pow.getExtension(i) for i in xrange(self.pow.countExtensions()))) |