POW.pkix handles null characters better than POW does

svn path=/scripts/gski.py; revision=1072

1 files changed, 9 insertions, 14 deletions

diff --git a/scripts/gski.py b/scripts/gski.py
index 6d1e34c3..210f1a60 100644
--- a/scripts/gski.py
+++ b/scripts/gski.py
@@ -1,19 +1,14 @@
 # $Id$
 
-import rpki.x509, POW.pkix, base64, getopt, sys
+import rpki.x509, POW.pkix, base64, sys
 
-opts, args = getopt.getopt(sys.argv[1:], "", ["pem", "der"])
+def g(x):
+  return base64.b64encode(x).replace("+", "-").replace("/", "_")
 
-use_pem = False
+def h(x):
+  return ":".join(("%02X" % ord(i) for i in x))
 
-for o, a in opts:
-  if o == "--pem": use_pem = True
-  if o == "--der": use_pem = False
-
-for file in args:
-  if use_pem:
-    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
+for file in sys.argv[1:]:
+  cert = rpki.x509.X509(Auto_file = file)
+  ski = cert.get_SKI()
+  print g(ski), h(ski), file