projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2585be4
)
mod_tls: Offer the host-specific cert (when there is one) to incoming c2s/s2s connect...
author
Matthew Wild
<mwild1@gmail.com>
Sat, 17 Oct 2009 15:25:28 +0000
(16:25 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Sat, 17 Oct 2009 15:25:28 +0000
(16:25 +0100)
plugins/mod_tls.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_tls.lua
b/plugins/mod_tls.lua
index 79a74deb2d5e31343cfd33ca0de246dad7958fa9..8a45080341ec32afc70e91658a40f7f5ef49794c 100644
(file)
--- a/
plugins/mod_tls.lua
+++ b/
plugins/mod_tls.lua
@@
-19,6
+19,9
@@
module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
if session.conn.starttls then
session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
session:reset_stream();
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();
session.log("info", "TLS negotiation started...");
session.secure = false;
session.conn.starttls();
session.log("info", "TLS negotiation started...");
session.secure = false;
@@
-33,6
+36,9
@@
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.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();
session.log("info", "TLS negotiation started for incoming s2s...");
session.secure = false;
session.conn.starttls();
session.log("info", "TLS negotiation started for incoming s2s...");
session.secure = false;