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
commit7835e7573e12cc36b70110705dd7b5571d26fbb9 (patch)
tree9dda5118b8049593897f08f728992882604e53f4
parente0c0cf5743fdbadd5220ebadd8511b76d4547c8a (diff)
parent0dfbace5560dc05a5ddbdb89819efdc9ae9ae0e3 (diff)
downloadprosody-7835e7573e12cc36b70110705dd7b5571d26fbb9.tar.gz
prosody-7835e7573e12cc36b70110705dd7b5571d26fbb9.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 = {},