diff options
| author | Kim Alvefur <zash@zash.se> | 2013-10-15 01:38:02 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-10-15 01:38:02 +0200 |
| commit | 243b96a44040e06cc7164d6fe96b48da8ae23388 (patch) | |
| tree | b0fe7dbc40ec776c811a1efc89510497970b46c7 /core/certmanager.lua | |
| parent | b8308a01ffae00c3a0c9a9557036d6760c1cad57 (diff) | |
| parent | 65931067bf8d24dc78885fabeed2297864ccebde (diff) | |
| download | prosody-243b96a44040e06cc7164d6fe96b48da8ae23388.tar.gz prosody-243b96a44040e06cc7164d6fe96b48da8ae23388.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
| -rw-r--r-- | core/certmanager.lua | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index caa4afce..0709c650 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -53,8 +53,12 @@ if ssl and not luasec_has_verifyext and ssl.x509 then end end -if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then - core_defaults.options[#core_defaults.options+1] = "no_compression"; +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"; + if configmanager.get("*", "ssl_compression") ~= true then + core_defaults.options[#core_defaults.options+1] = "no_compression"; + end end function create_context(host, mode, user_ssl_config) |