allow key2pub.py to read public pem files too
authorJohannes Berg <johannes@sipsolutions.net>
Sat, 24 May 2008 17:34:54 +0000 (19:34 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Sat, 24 May 2008 17:34:54 +0000 (19:34 +0200)
key2pub.py

index 0bfb4e4..477bc87 100755 (executable)
@@ -101,7 +101,10 @@ if not mode in modes:
 # load key
 idx = 0
 for f in files:
-    key = RSA.load_key(f)
+    try:
+        key = RSA.load_pub_key(f)
+    except RSA.RSAError:
+        key = RSA.load_key(f)
 
     modes[mode][0]('e_%d' % idx, key.e[4:])
     modes[mode][0]('n_%d' % idx, key.n[4:])