diff options
| author | Rob Austein <sra@hactrn.net> | 2007-08-15 06:51:54 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-08-15 06:51:54 +0000 |
| commit | 43b61961de173b35df5bca8e982dacb7a76f1b5d (patch) | |
| tree | 7cd194464dec76fb47a7be336484457890bb3944 /scripts/gski.py | |
| parent | cebd2c29f56bcc7d92718296663df185fa481d17 (diff) | |
Cleanup
svn path=/scripts/gski.py; revision=882
Diffstat (limited to 'scripts/gski.py')
| -rw-r--r-- | scripts/gski.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/gski.py b/scripts/gski.py index f7e6dbf6..6d1e34c3 100644 --- a/scripts/gski.py +++ b/scripts/gski.py @@ -1,6 +1,6 @@ # $Id$ -import POW, POW.pkix, base64, getopt, sys +import rpki.x509, POW.pkix, base64, getopt, sys opts, args = getopt.getopt(sys.argv[1:], "", ["pem", "der"]) @@ -11,12 +11,9 @@ for o, a in opts: if o == "--der": use_pem = False for file in args: - f = open(file, "r") - der = f.read() - f.close() if use_pem: - der = POW.pemRead(POW.X509_CERTIFICATE, der).derWrite() - cert = POW.pkix.Certificate() - cert.fromString(der) - ski = base64.b64encode([x for x in cert.getExtensions() if x[0] == (2, 5, 29, 14)][0][2]).replace("+", "-").replace("/", "_") + cert = rpki.x509.X509(PEM_file=file) + else: + cert = rpki.x509.X509(DER_file=file) + ski = base64.b64encode([x for x in cert.get_POWpkix().getExtensions() if x[0] == (2, 5, 29, 14)][0][2]).replace("+", "-").replace("/", "_") print ski, file |