aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-29 13:45:03 +0200
committerKim Alvefur <zash@zash.se>2017-09-29 13:45:03 +0200
commitca622317f100d67023e2088179011eb61a243a2d (patch)
treecd04cb8a03e077a91511ed8d509a4e2e83588628 /core/certmanager.lua
parentdb450adf9e7f6dbb96cddb15a8b929f367435981 (diff)
parent37d1497aedaf666ed0a1c4d5eeb47c54b1efd98c (diff)
downloadprosody-ca622317f100d67023e2088179011eb61a243a2d.tar.gz
prosody-ca622317f100d67023e2088179011eb61a243a2d.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 288836ce..2be66a21 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -107,6 +107,12 @@ local core_defaults = {
};
verifyext = { "lsec_continue", "lsec_ignore_purpose" };
curve = "secp384r1";
+ curveslist = {
+ "X25519",
+ "P-384",
+ "P-256",
+ "P-521",
+ };
ciphers = { -- Enabled ciphers in order of preference:
"HIGH+kEDH", -- Ephemeral Diffie-Hellman key exchange, if a 'dhparam' file is set
"HIGH+kEECDH", -- Ephemeral Elliptic curve Diffie-Hellman key exchange
@@ -231,4 +237,5 @@ prosody.events.add_handler("config-reloaded", reload_ssl_config);
return {
create_context = create_context;
reload_ssl_config = reload_ssl_config;
+ find_cert = find_cert;
};