1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Added conditionals for libmesode cert verification

This commit is contained in:
James Booth 2015-09-22 21:55:46 +01:00
parent 9414ad268d
commit 9a53854a1d

View File

@ -360,12 +360,14 @@ _connection_free_session_data(void)
presence_clear_sub_requests(); presence_clear_sub_requests();
} }
#ifdef HAVE_LIBMESODE
static int static int
_connection_certfail_cb(const char * const certname, const char * const certfp, _connection_certfail_cb(const char * const certname, const char * const certfp,
char * const notbefore, const char * const notafter, const char * const errormsg) char * const notbefore, const char * const notafter, const char * const errormsg)
{ {
return sv_ev_certfail(errormsg, certname, certfp, notbefore, notafter); return sv_ev_certfail(errormsg, certname, certfp, notbefore, notafter);
} }
#endif
static jabber_conn_status_t static jabber_conn_status_t
_jabber_connect(const char * const fulljid, const char * const passwd, _jabber_connect(const char * const fulljid, const char * const passwd,
@ -417,8 +419,13 @@ _jabber_connect(const char * const fulljid, const char * const passwd,
xmpp_conn_disable_tls(jabber_conn.conn); xmpp_conn_disable_tls(jabber_conn.conn);
} }
#ifdef HAVE_LIBMESODE
int connect_status = xmpp_connect_client(jabber_conn.conn, altdomain, port, int connect_status = xmpp_connect_client(jabber_conn.conn, altdomain, port,
_connection_certfail_cb, _connection_handler, jabber_conn.ctx); _connection_certfail_cb, _connection_handler, jabber_conn.ctx);
#else
int connect_status = xmpp_connect_client(jabber_conn.conn, altdomain, port,
_connection_handler, jabber_conn.ctx);
#endif
if (connect_status == 0) if (connect_status == 0)
jabber_conn.conn_status = JABBER_CONNECTING; jabber_conn.conn_status = JABBER_CONNECTING;