Merge pull request #3 from mwielgoszewski/patch-1

Pass passphrase callback argument to importKey() method
tomrittervg · Oct 20, 2013 · 512d50d · 512d50d
2 parents cd66046 + 83964f5
commit 512d50d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/decrypt-windows-ec2-passwd.py b/decrypt-windows-ec2-passwd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import base64, binascii, optparse, sys
+import base64, binascii, getpass, optparse, sys
 from Crypto.PublicKey import RSA
 
 
@@ -75,10 +75,10 @@ def decryptPassword(rsaKey, password):
     keyLines = keyFile.readlines()
     #Import it
     try:
-        key = RSA.importKey(keyLines)
-    except:
+        key = RSA.importKey(keyLines, passphrase=getpass.getpass('Encrypted Key Password (leave blank if none): '))
+    except ValueError:
         print "Could not import SSH Key (Is it an RSA key? Is it password protected?)"
         sys.exit(-1)
     #Decrypt it
     print ""
-    print "Password:", decryptPassword(key, options.password)
+    print "Password:", decryptPassword(key, options.password)