diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2011-10-07 14:39:49 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2011-10-07 14:39:49 +0000 |
| commit | 47f74e4c132601626bc9ec5278622b8f3ce9b764 (patch) | |
| tree | f51b4714667a923f6d95171e6d84c0cbbe7f9027 | |
| parent | 5e8e62df1d4ed5e36ede15ce482276cc824b6bec (diff) | |
| download | acf-openssl-47f74e4c132601626bc9ec5278622b8f3ce9b764.tar.bz2 acf-openssl-47f74e4c132601626bc9ec5278622b8f3ce9b764.tar.xz | |
Change certype to certtype
| -rwxr-xr-x | openssl-controller.lua | 2 | ||||
| -rwxr-xr-x | openssl-model.lua | 6 | ||||
| -rw-r--r-- | openssl-status-html.lsp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/openssl-controller.lua b/openssl-controller.lua index aa03ba6..e7daabd 100755 --- a/openssl-controller.lua +++ b/openssl-controller.lua @@ -118,7 +118,7 @@ end downloadcacert = function(self) self.conf.viewtype="stream" - return self.model.getca(self.clientdata.certype) + return self.model.getca(self.clientdata.certtype) end -- Generate a self-signed CA diff --git a/openssl-model.lua b/openssl-model.lua index c5c5ba8..44e1635 100755 --- a/openssl-model.lua +++ b/openssl-model.lua @@ -696,16 +696,16 @@ getcrl = function(crltype) return crlfile end -getca = function(certype) +getca = function(certtype) local result = cfe({ type="raw", option="application/x-x509-ca-cert" }) local fname = "cacert." - if string.lower(certype or "") == "der" then + if string.lower(certtype or "") == "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" result.label = fname - elseif string.lower(certype or "") == "pem" then + elseif string.lower(certtype or "") == "pem" then fname = fname.."pem" result.label = fname else diff --git a/openssl-status-html.lsp b/openssl-status-html.lsp index 21dffea..1d3964c 100644 --- a/openssl-status-html.lsp +++ b/openssl-status-html.lsp @@ -41,8 +41,8 @@ end %> <% if viewlibrary.check_permission("downloadcacert") then %> <H1>Download CA Cert</H1> <DL> -<%= html.link{value="downloadcacert?certype=pem", label="Download PEM"} %><BR> -<%= html.link{value="downloadcacert?certype=der", label="Download DER"} %><BR> +<%= html.link{value="downloadcacert?certtype=pem", label="Download PEM"} %><BR> +<%= html.link{value="downloadcacert?certtype=der", label="Download DER"} %><BR> <%= html.link{value="downloadcacert", label="Import to Firefox"} %><BR> </DL> <% end %> |