From cc00637cea7e19beee2a3ad1c8f0baf3f233d789 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sun, 13 Feb 2011 22:41:08 -0500 Subject: [PATCH] Enable XMPP over TLS. I don't know why this works now when it didn't work before. Perhaps we fixed something in the I/O layer recently. --- citadel/modules/xmpp/serv_xmpp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index a3084c6b1..01d130155 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -142,12 +142,15 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr) /* The features of this stream are... */ cprintf(""); -#ifdef HAVE_OPENSSL_XXXX_COMMENTED_OUT - /* TLS encryption (but only if it isn't already active) */ + /* + * TLS encryption (but only if it isn't already active) + * + * NOTE: if TLS doesn't handshake properly for whatever reason, + * comment out these three lines to disable it at the server. + */ if (!CC->redirect_ssl) { cprintf(""); } -#endif if (!CC->logged_in) { /* If we're not logged in yet, offer SASL as our feature set */ -- 2.30.2