aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-11 20:00:15 +0200
committerKim Alvefur <zash@zash.se>2015-10-11 20:00:15 +0200
commit3c66dcabd1962de1b9e3d5f31d76f5569124cae2 (patch)
tree9dda5118b8049593897f08f728992882604e53f4
parent14d22d84e49f1bb660c2b1e7a35f4b6e4a7a3718 (diff)
parent99cee90a446f24ae0b01cb029ec9a3cd241ad306 (diff)
downloadprosody-3c66dcabd1962de1b9e3d5f31d76f5569124cae2.tar.gz
prosody-3c66dcabd1962de1b9e3d5f31d76f5569124cae2.zip
Merge 0.9->0.10
-rw-r--r--util/openssl.lua10
1 files changed, 7 insertions, 3 deletions
diff --git a/util/openssl.lua b/util/openssl.lua
index ef3fba96..39fe99d6 100644
--- a/util/openssl.lua
+++ b/util/openssl.lua
@@ -18,8 +18,8 @@ function config.new()
return setmetatable({
req = {
distinguished_name = "distinguished_name",
- req_extensions = "v3_extensions",
- x509_extensions = "v3_extensions",
+ req_extensions = "certrequest",
+ x509_extensions = "selfsigned",
prompt = "no",
},
distinguished_name = {
@@ -31,12 +31,16 @@ function config.new()
commonName = "example.com",
emailAddress = "xmpp@example.com",
},
- v3_extensions = {
+ certrequest = {
basicConstraints = "CA:FALSE",
keyUsage = "digitalSignature,keyEncipherment",
extendedKeyUsage = "serverAuth,clientAuth",
subjectAltName = "@subject_alternative_name",
},
+ selfsigned = {
+ basicConstraints = "CA:TRUE",
+ subjectAltName = "@subject_alternative_name",
+ },
subject_alternative_name = {
DNS = {},
otherName = {},