Merge 0.9->trunk

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 92b63ec3596335880abca2e7561b916926d1e355..dc08cb78456e7a246d0e8fa6f072b72a8c739890 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -38,6 +38,7 @@ local core_defaults = {
        options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil };
        verifyext = { "lsec_continue", "lsec_ignore_purpose" };
        curve = "secp384r1";
+       ciphers = "HIGH:!DSS:!aNULL@STRENGTH";
 }
 local path_options = { -- These we pass through resolve_path()
        key = true, certificate = true, cafile = true, capath = true