util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks...

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 350fb837af938958f3df2d9459fe0a60148f58df..d6784a968f68d16c2f7f840576df0fcfc7b63913 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -33,7 +33,7 @@ module "certmanager"
 local default_ssl_config = configmanager.get("*", "ssl");
 local default_capath = "/etc/ssl/certs";
 local default_verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
-local default_options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil };
+local default_options = { "no_sslv2", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil };
 local default_verifyext = { "lsec_continue", "lsec_ignore_purpose" };
 
 if ssl and not luasec_has_verifyext and ssl.x509 then
@@ -70,7 +70,7 @@ function create_context(host, mode, user_ssl_config)
                options = user_ssl_config.options or default_options;
                depth = user_ssl_config.depth;
                curve = user_ssl_config.curve or "secp384r1";
-               ciphers = user_ssl_config.ciphers or "HIGH:!DSS:!aNULL@STRENGTH";
+               ciphers = user_ssl_config.ciphers or "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL";
                dhparam = user_ssl_config.dhparam;
        };