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 | 62fa3829038c60a13929feac244833fabae48c43 (patch) | |
| tree | 409866ae1508da411182f14f5db3a5e7f731c60c /core | |
| parent | d8155aef2c5323708f59d95540aafd1824eedcb9 (diff) | |
| parent | 234d0b83c735aa7cde49aa652191406a009acdef (diff) | |
| download | prosody-62fa3829038c60a13929feac244833fabae48c43.tar.gz prosody-62fa3829038c60a13929feac244833fabae48c43.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -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 |