aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-13 00:09:56 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-13 00:09:56 +0100
commit616c7ef5507e3005d41441df03f3096ed4f8216a (patch)
treeca1115da627fa591b3ed1aca2f6400935f6a8a5c /core
parent6008554b60d04336b81601196c08a90875bdf088 (diff)
parent1290bf766c700f939d9f63da1968b1e6357c75bf (diff)
downloadprosody-616c7ef5507e3005d41441df03f3096ed4f8216a.tar.gz
prosody-616c7ef5507e3005d41441df03f3096ed4f8216a.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 4b96e774..472e1665 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -64,7 +64,7 @@ function create_context(host, mode, user_ssl_config)
verifyext = user_ssl_config.verifyext or default_verifyext;
options = user_ssl_config.options or default_options;
depth = user_ssl_config.depth;
- curve = user_ssl_config.curve;
+ curve = user_ssl_config.curve or "secp384r1";
dhparam = user_ssl_config.dhparam;
};