From 8e37fb1ddea5c72a25d1971ef9634dca12d3c39d Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Sat, 1 Sep 2018 11:32:39 +0300
Subject: load_cert function

---
 dmvpn-ca | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'dmvpn-ca')

diff --git a/dmvpn-ca b/dmvpn-ca
index 4cec0ea..9ae3caa 100755
--- a/dmvpn-ca
+++ b/dmvpn-ca
@@ -225,14 +225,12 @@ function decrypt_key(key)
 	return pkey.new(key, 'PEM', 'private', get_password)
 end
 
+function load_cert(row)
+	return x509.new(row.data, 'PEM'), decrypt_key(row.privateKey)
+end
+
 function load_ca_cert()
-	if not ca_cert then
-		local row = select_one(
-			'data, privateKey', 'certificate', {serial=0}, 'n'
-		)
-		ca_cert = x509.new(row[1], 'PEM')
-		ca_key = decrypt_key(row[2])
-	end
+	if not ca_cert then ca_cert, ca_key = load_cert(select_cert(0)) end
 	return ca_cert, ca_key
 end
 
-- 
cgit v1.2.3