# HG changeset patch # User Matthew Wild # Date 1264952344 0 # Node ID 0a78847b38e223a5cb4a5aa6052e0a46c8004fc5 # Parent 2febd008214e2cb7e07dc1a04db16aaf4183d3de mod_tls: Update for new server SSL syntax diff -r 2febd008214e -r 0a78847b38e2 plugins/mod_tls.lua --- a/plugins/mod_tls.lua Sun Jan 31 15:37:08 2010 +0000 +++ b/plugins/mod_tls.lua Sun Jan 31 15:39:04 2010 +0000 @@ -14,15 +14,15 @@ 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 @@ 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