Software / code / prosody
Changeset
5908:081a91507e4f
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 10 Nov 2013 18:49:34 +0000 |
| parents | 5904:c1bc2c20a80a (current diff) 5907:9586979058b8 (diff) |
| children | 5909:d6b3891f186c 5910:a19b3646d5f0 |
| files | core/certmanager.lua util/set.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Sat Nov 09 18:36:32 2013 +0000 +++ b/core/certmanager.lua Sun Nov 10 18:49:34 2013 +0000 @@ -40,7 +40,7 @@ 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:!DSS:!aNULL@STRENGTH"; + ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL"; } local path_options = { -- These we pass through resolve_path() key = true, certificate = true, cafile = true, capath = true, dhparam = true
--- a/util/set.lua Sat Nov 09 18:36:32 2013 +0000 +++ b/util/set.lua Sun Nov 10 18:49:34 2013 +0000 @@ -23,7 +23,7 @@ return _M.difference(set1, set2); end function set_mt.__div(set, func) - local new_set, new_items = _M.new(); + local new_set = _M.new(); local items, new_items = set._items, new_set._items; for item in pairs(items) do local new_item = func(item);
