From: Steven Barth <steven@midlink.org>
Date: Sun, 7 Jun 2009 11:38:20 +0000 (+0000)
Subject: LuCId: DER certificate / key support
X-Git-Tag: 0.9.0~255
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=c766f9750f8d0ff1aa6e40da4df3f3e4faba8eb5;p=project%2Fluci.git

LuCId: DER certificate / key support
---

diff --git a/libs/lucid/luasrc/lucid/tcpserver.lua b/libs/lucid/luasrc/lucid/tcpserver.lua
index db94ba0ec..60fad8b2f 100644
--- a/libs/lucid/luasrc/lucid/tcpserver.lua
+++ b/libs/lucid/luasrc/lucid/tcpserver.lua
@@ -172,13 +172,18 @@ end
 function prepare_tls(tlskey)
 	local tls = nixio.tls("server")
 	if tlskey and cursor:get(UCINAME, tlskey) then
+		local xtype = cursor:get(UCINAME, tlskey, "type")
 		local cert = cursor:get(UCINAME, tlskey, "cert")
 		if cert then
-			tls:set_cert(cert)
+			if not tls:set_cert(cert, xtype) then
+				nixio.syslog("err", "Unable to load certificate: " .. cert)
+			end
 		end
 		local key = cursor:get(UCINAME, tlskey, "key")
 		if key then
-			tls:set_key(key)
+			if not tls:set_key(key, xtype) then
+				nixio.syslog("err", "Unable to load private key: " .. key)
+			end
 		end
 		local ciphers = cursor:get(UCINAME, tlskey, "ciphers")
 		if ciphers then
@@ -189,4 +194,4 @@ function prepare_tls(tlskey)
 		end
 	end
 	return tls
-end
\ No newline at end of file
+end