aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-08-15 23:39:42 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2018-09-01 21:34:45 +0300
commita2c9f4db87eabdc4e968f273cf555128292f0663 (patch)
treef66259f9831ae4201835e971337b7e16bfe627a8
parentbc95778acf403a666cadcba4bac69685600eb485 (diff)
downloaddmvpn-tools-a2c9f4db87eabdc4e968f273cf555128292f0663.tar.bz2
dmvpn-tools-a2c9f4db87eabdc4e968f273cf555128292f0663.tar.xz
load_ca: rename function
-rwxr-xr-xdmvpn-ca7
1 files changed, 3 insertions, 4 deletions
diff --git a/dmvpn-ca b/dmvpn-ca
index 610e8d4..72596ea 100755
--- a/dmvpn-ca
+++ b/dmvpn-ca
@@ -221,7 +221,7 @@ function decrypt_key(key)
return pkey.new(key, 'PEM', 'private', get_password)
end
-function load_ca()
+function load_ca_cert()
if not ca_cert then
local row = select_one(
'data, privateKey', 'certificate', {serial=0}, 'n'
@@ -240,7 +240,7 @@ function encrypt_key(key, new_pw, pw_id)
end
function sign(object, hash_alg, cert, key)
- if not cert then cert, key = load_ca() end
+ if not cert then cert, key = load_ca_cert() end
object:setIssuer(cert:getSubject())
object:addExtension(
@@ -345,9 +345,8 @@ function export_cert(cert)
end
password = string.char(table.unpack(password))
- local ca_cert = load_ca()
local chain = x509ch.new()
- chain:add(ca_cert)
+ chain:add(load_ca_cert())
chain:add(x509.new(cert.data, 'PEM'))
local file = io.open(