diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-13 00:46:29 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-13 00:46:29 +0100 |
commit | 4191089ebd038a29b31d96625093ef68635bf9c1 (patch) | |
tree | d1f0f6d477f68bd8bbb9fef3dff9b3186ba8f881 | |
parent | 616c7ef5507e3005d41441df03f3096ed4f8216a (diff) | |
parent | 0aef21fc95c949fcf2cfaf1a841de9cf04c49f87 (diff) | |
download | prosody-4191089ebd038a29b31d96625093ef68635bf9c1.tar.gz prosody-4191089ebd038a29b31d96625093ef68635bf9c1.zip |
Merge 0.9->trunk
-rw-r--r-- | core/certmanager.lua | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 472e1665..5618589b 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -44,6 +44,11 @@ if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= tr default_options[#default_options+1] = "no_compression"; end +if luasec_has_no_compression then -- Has no_compression? Then it has these too... + default_options[#default_options+1] = "single_dh_use"; + default_options[#default_options+1] = "single_ecdh_use"; +end + function create_context(host, mode, user_ssl_config) user_ssl_config = user_ssl_config or default_ssl_config; |