aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-09-03 12:11:11 +0100
committerMatthew Wild <mwild1@gmail.com>2013-09-03 12:11:11 +0100
commitcf82f353b7737e5fc59eae086424d8ef63951934 (patch)
tree140938acb11b9dcfb16868daad072c4da689d41f /core/certmanager.lua
parentcb7584022716f4407b4460754645e6af587e4730 (diff)
downloadprosody-cf82f353b7737e5fc59eae086424d8ef63951934.tar.gz
prosody-cf82f353b7737e5fc59eae086424d8ef63951934.zip
certmanager: Fix for working around a bug with LuaSec 0.4.1 that causes it to not honour the 'ciphers' option. This change will apply 0.9's default cipher string for LuaSec 0.4.1 users.
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 5dee5876..5aec22b3 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -74,11 +74,11 @@ function create_context(host, mode, user_ssl_config)
local ctx, err = ssl_newcontext(ssl_config);
- -- LuaSec ignores the cipher list from the config, so we have to take care
- -- of it ourselves (W/A for #x)
- if ctx and user_ssl_config.ciphers then
+ -- COMPAT: LuaSec 0.4.1 ignores the cipher list from the config, so we have to take
+ -- care of it ourselves...
+ if ctx and ssl_config.ciphers then
local success;
- success, err = ssl.context.setcipher(ctx, user_ssl_config.ciphers);
+ success, err = ssl.context.setcipher(ctx, ssl_config.ciphers);
if not success then ctx = nil; end
end