Merge with tip.

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 09470083bd5143e15580546ddeaa41580d6161e7..706b42c948429d279b48220e7f570f9402bda0f8 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -19,7 +19,10 @@ module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                        if session.conn.starttls then
                                session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
                                session:reset_stream();
-                               session.conn.starttls();
+                               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();
                                session.log("info", "TLS negotiation started...");
                                session.secure = false;
                        else
@@ -33,7 +36,10 @@ module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
                        if session.conn.starttls then
                                session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
                                session:reset_stream();
-                               session.conn.starttls();
+                               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();
                                session.log("info", "TLS negotiation started for incoming s2s...");
                                session.secure = false;
                        else
@@ -73,7 +79,7 @@ module:hook("s2s-stream-features",
 module:hook_stanza(xmlns_stream, "features",
                function (session, stanza)
                        module:log("debug", "Received features element");
-                       if stanza:child_with_ns(xmlns_starttls) then
+                       if session.conn.starttls and stanza:child_with_ns(xmlns_starttls) then
                                module:log("%s is offering TLS, taking up the offer...", session.to_host);
                                session.sends2s("<starttls xmlns='"..xmlns_starttls.."'/>");
                                return true;
@@ -85,7 +91,7 @@ module:hook_stanza(xmlns_starttls, "proceed",
                        module:log("debug", "Proceeding with TLS on s2sout...");
                        local format, to_host, from_host = string.format, session.to_host, session.from_host;
                        session:reset_stream();
-                       session.conn.starttls(true);
+                       session.conn:starttls(true);
                        session.secure = false;
                        return true;
                end);