aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/jabber.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2011-12-23 13:44:08 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2011-12-23 13:44:08 +0100
commit792a93b417c24a206d8995ca8bf51482f20e997e (patch)
treec29c4ceae134df4ad52e79ef50bc09d00e1b245d /protocols/jabber/jabber.c
parent2d93a51e15ac2d6daaac0d6ac1e2c41e33486c53 (diff)
parent41658da57b611d17030dc7e2c3feb54f99b668ac (diff)
Merging SSL certificate verification for GnuTLS, with help from AopicieR.
Diffstat (limited to 'protocols/jabber/jabber.c')
-rw-r--r--protocols/jabber/jabber.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index fae55ffe..2856f1b6 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -81,6 +81,9 @@ static void jabber_init( account_t *acc )
s = set_add( &acc->set, "tls", "try", set_eval_tls, acc );
s->flags |= ACC_SET_OFFLINE_ONLY;
+ s = set_add( &acc->set, "tls_verify", "true", set_eval_bool, acc );
+ s->flags |= ACC_SET_OFFLINE_ONLY;
+
s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
@@ -232,7 +235,7 @@ static void jabber_login( account_t *acc )
non-standard ports... */
if( set_getbool( &acc->set, "ssl" ) )
{
- jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), jabber_connected_ssl, ic );
+ jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), FALSE, jabber_connected_ssl, ic );
jd->fd = jd->ssl ? ssl_getfd( jd->ssl ) : -1;
}
else