diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-11-21 02:15:36 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-11-21 02:15:36 +0000 |
| commit | b97004e26e179b6a75ddd99fe2b817ce12badfe9 (patch) | |
| tree | 409866ae1508da411182f14f5db3a5e7f731c60c | |
| parent | 1712a45fdc3fb3da014ad85e97eb7c7dab855e9a (diff) | |
| parent | cb77e4d2580284e28a6c4562b613e5c9904a120e (diff) | |
| download | prosody-b97004e26e179b6a75ddd99fe2b817ce12badfe9.tar.gz prosody-b97004e26e179b6a75ddd99fe2b817ce12badfe9.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index c88f7a27..9dfb8f3a 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -40,7 +40,7 @@ local core_defaults = { options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil }; verifyext = { "lsec_continue", "lsec_ignore_purpose" }; curve = "secp384r1"; - ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL"; + ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL"; } local path_options = { -- These we pass through resolve_path() key = true, certificate = true, cafile = true, capath = true, dhparam = true |