summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-07-16 20:19:11 +0000
committerTed Trask <ttrask01@yahoo.com>2008-07-16 20:19:11 +0000
commit65e30e8cc9e25ec62c5d2ecf2e089cc55ba9f368 (patch)
tree7af9a5b55fab12116260e043899ab5bfd913c467
parent67aba2af2bc6203d58b4a1e52f86bcfae3e382f1 (diff)
downloadacf-openssl-65e30e8cc9e25ec62c5d2ecf2e089cc55ba9f368.tar.bz2
acf-openssl-65e30e8cc9e25ec62c5d2ecf2e089cc55ba9f368.tar.xz
Add cert extensions to the request just for clarity.
git-svn-id: svn://svn.alpinelinux.org/acf/openssl/trunk@1312 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--openssl-model.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/openssl-model.lua b/openssl-model.lua
index 9c34711..71fa1ae 100644
--- a/openssl-model.lua
+++ b/openssl-model.lua
@@ -302,7 +302,7 @@ getreqdefaults = function()
if config.req.req_extensions then
extensions = getopts.getsection(configfile, config.req.req_extensions)
end
- defaults.value.extensions = cfe({ type="longtext", label="Additional x509 Extensions", value=extensions })
+ defaults.value.extensions = cfe({ type="longtext", label="Additional x509 Extensions", value=extensions, descr="These extensions can be overridden by the Certificate Type" })
return defaults
end
@@ -386,12 +386,14 @@ submitrequest = function(defaults, user)
else
ext_section = config.req.req_extensions
end
- --[[if config[defaults.value.certtype.value].x509_extensions then
+ if config[defaults.value.certtype.value].x509_extensions then
ext_section = config[defaults.value.certtype.value].x509_extensions
for name,value in pairs(config[ext_section] or {}) do
- a,b,c,temp = getopts.setoptsinfile(temp, "", name, value)
+ if not string.find(value, "issuer") then
+ a,b,c,temp = getopts.setoptsinfile(temp, "", name, value)
+ end
end
- end--]]
+ end
a,b,c,fileval = getopts.setsection(fileval, ext_section, temp)
fs.write_file(configfile..".tmp", fileval)