mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.openssl: Write the distinguished_name part of the config in a consistent order

Browse source
This commit is contained in:
Kim Alvefur 2013-04-29 13:30:59 +02:00
parent 362a2f35ba
commit 2748b362ac
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
util/openssl.lua
View file

@ -23,11 +23,12 @@ function config.new()
prompt = "no",
},
distinguished_name = {
commonName = "example.com",
countryName = "GB",
-- stateOrProvinceName = "",
localityName = "The Internet",
organizationName = "Your Organisation",
organizationalUnitName = "XMPP Department",
commonName = "example.com",
emailAddress = "xmpp@example.com",
},
v3_extensions = {
@ -43,6 +44,17 @@ function config.new()
}, ssl_config_mt);
end
local DN_order = {
"countryName";
"stateOrProvinceName";
"localityName";
"streetAddress";
"organizationName";
"organizationalUnitName";
"commonName";
"emailAddress";
}
_M._DN_order = DN_order;
function ssl_config:serialize()
local s = "";
for k, t in pairs(self) do
@ -53,6 +65,14 @@ function ssl_config:serialize()
s = s .. s_format("%s.%d = %s\n", san, i -1, n[i]);
end
end
elseif k == "distinguished_name" then
for i=1,#DN_order do
local k = DN_order[i]
local v = t[k];
if v then
s = s .. ("%s = %s\n"):format(k, v);
end
end
else
for k, v in pairs(t) do
s = s .. ("%s = %s\n"):format(k, v);