Enable XMPP over TLS.
authorArt Cancro <ajc@citadel.org>
Mon, 14 Feb 2011 03:41:08 +0000 (22:41 -0500)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Sep 2011 14:13:28 +0000 (14:13 +0000)
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

index a3084c6b1e1debeeaf87b55b327f6a03944e5e9d..01d1301556576c4844686ecefd508280e4f43620 100644 (file)
@@ -142,12 +142,15 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
        /* The features of this stream are... */
        cprintf("<stream:features>");
 
-#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("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
        }
-#endif
 
        if (!CC->logged_in) {
                /* If we're not logged in yet, offer SASL as our feature set */