aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-09-05 11:30:27 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-09-05 11:30:27 +0300
commit64e8e519a193a7c54cfdf8bb2cd2dca30cdf3d27 (patch)
tree77f023e6dc7eaedbe27cdcac4aae4432978a96b1
parentf76bbfdf9d313f571b2a2614c12eeaf8f03c00cf (diff)
downloaddmvpn-tools-64e8e519a193a7c54cfdf8bb2cd2dca30cdf3d27.tar.bz2
dmvpn-tools-64e8e519a193a7c54cfdf8bb2cd2dca30cdf3d27.tar.xz
dmvpn-pfx-decode: accept hyphen in site name
-rwxr-xr-xdmvpn-pfx-decode2
1 files changed, 1 insertions, 1 deletions
diff --git a/dmvpn-pfx-decode b/dmvpn-pfx-decode
index 1ec2830..ac30ea9 100755
--- a/dmvpn-pfx-decode
+++ b/dmvpn-pfx-decode
@@ -15,7 +15,7 @@ data = file:read('*a')
file:close()
name = name:match('/([^/]+)$') or name
-password = name:match('^%w*_%d+%.(%w+)%.pfx$')
+password = name:match('^[-%w]*_%d+%.(%w+)%.pfx$')
if password then
success, key, cert, chain = pcall(pkcs12.parse, data, password)
end