aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdmvpn-pfx-decode7
-rw-r--r--dmvpn.lua9
2 files changed, 10 insertions, 6 deletions
diff --git a/dmvpn-pfx-decode b/dmvpn-pfx-decode
index 2ec13a9..eecd3f5 100755
--- a/dmvpn-pfx-decode
+++ b/dmvpn-pfx-decode
@@ -19,12 +19,7 @@ if password then
success, key, cert, chain = pcall(pkcs12.parse, data, password)
end
if not success then
- io.stderr:write('Password: ')
- os.execute('stty -echo')
- password = io.read()
- os.execute('stty echo')
- io.stderr:write('\n')
- key, cert, chain = pkcs12.parse(data, password)
+ key, cert, chain = pkcs12.parse(data, dmvpn.get_password())
end
function write_pem_file(dir, data)
diff --git a/dmvpn.lua b/dmvpn.lua
index 32419f8..14e8c92 100644
--- a/dmvpn.lua
+++ b/dmvpn.lua
@@ -42,4 +42,13 @@ local decoders={
function M.decode_ext(oid, ext) return decoders[oid](ext:getData()) end
+function M.get_password()
+ io.stderr:write('Password: ')
+ os.execute('stty -echo')
+ local res = io.read()
+ os.execute('stty echo')
+ io.stderr:write('\n')
+ return res
+end
+
return M