aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-01-31 15:39:04 +0000
committerMatthew Wild <mwild1@gmail.com>2010-01-31 15:39:04 +0000
commitf8a121c33bdeed0c4770b2cb2c6801f7ac8efbd9 (patch)
tree2f3bc1ac9c84e41407d04edf2152f74cd6c8b2dd
parent5c117c0f257948b071ef598f615b17e76f968c77 (diff)
downloadprosody-f8a121c33bdeed0c4770b2cb2c6801f7ac8efbd9.tar.gz
prosody-f8a121c33bdeed0c4770b2cb2c6801f7ac8efbd9.zip
mod_tls: Update for new server SSL syntax
-rw-r--r--plugins/mod_tls.lua14
1 files changed, 6 insertions, 8 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 706b42c9..10bc21cd 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -14,15 +14,15 @@ local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
local secure_s2s_only = module:get_option("s2s_require_encryption");
+local global_ssl_ctx = prosody.global_ssl_ctx;
+
module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
function (session, stanza)
if session.conn.starttls then
session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
session:reset_stream();
- if session.host and hosts[session.host].ssl_ctx_in then
- session.conn:set_sslctx(hosts[session.host].ssl_ctx_in);
- end
- session.conn:starttls();
+ local ssl_ctx = session.host and hosts[session.host].ssl_ctx_in or global_ssl_ctx;
+ session.conn:starttls(ssl_ctx);
session.log("info", "TLS negotiation started...");
session.secure = false;
else
@@ -36,10 +36,8 @@ module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
if session.conn.starttls then
session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
session:reset_stream();
- if session.to_host and hosts[session.to_host].ssl_ctx_in then
- session.conn:set_sslctx(hosts[session.to_host].ssl_ctx_in);
- end
- session.conn:starttls();
+ local ssl_ctx = session.to_host and hosts[session.to_host].ssl_ctx_in or global_ssl_ctx;
+ session.conn:starttls(ssl_ctx);
session.log("info", "TLS negotiation started for incoming s2s...");
session.secure = false;
else