Make getca always return ca, regardless of input

1 files changed, 9 insertions, 10 deletions

diff --git a/openssl-model.lua b/openssl-model.lua
index 702967f..c391e5c 100755
--- a/openssl-model.lua
+++ b/openssl-model.lua
@@ -684,10 +684,10 @@ getcrl = function(crltype)
 	local cmd = path .. "openssl crl -in "..openssldir.."ca-crl.crl -out "..openssldir.."ca-der-crl.crl -outform DER"
 	local f = io.popen(cmd)
 	f:close()
-	if crltype == "DER" then
+	if string.lower(crltype) == "der" then
 		crlfile.label = "ca-der-crl.crl"
 		crlfile.value = fs.read_file(crlfile.label) or ""
-	elseif crltype == "PEM" then
+	elseif string.lower(crltype) == "pem" then
 		crlfile.label = "ca-crl.crl"
 		crlfile.value = fs.read_file(crlfile.label) or ""
 	else
@@ -697,18 +697,17 @@ getcrl = function(crltype)
 end
 
 getca = function(certype)
-	
-	if certype == "der" then
+	local fname = "cacert."
+	if string.lower(certype) == "der" then
 		local cmd = path .. "openssl x509 -in "..openssldir.."cacert.pem -outform der -out "..openssldir.."cacert.der"
 		local f = io.popen(cmd)
 		f:close()
+		fname = fname.."der"
+	else
+		fname = fname.."pem"
 	end
-	local fname = "cacert."..certype
-	local dlcert = openssldir..fname	
-	local fread = fs.read_file(dlcert) or ""
-	if validator.is_valid_filename(dlcert, openssldir) then
-		return  cfe({ type="raw", value=fread, label=fname, option="application/x-x509-ca-cert" })
-	end
+	local fread = fs.read_file(fname) or ""
+	return  cfe({ type="raw", value=fread, label=fname, option="application/x-x509-ca-cert" })
 end
 
 getnewputca = function()