# HG changeset patch # User franky # Date 1383598084 -3600 # Node ID 91a8f3740a1a2ab8b50704127ad5b7484e8d8310 # Parent a18e1b488f1ce4404b6657ee2b8eb8827bc7c9a3 Added setting "ssl_ca" to set additional certificates to trust diff -r a18e1b488f1c -r 91a8f3740a1a mcabber/configure.ac --- a/mcabber/configure.ac Fri Oct 25 22:20:23 2013 +0200 +++ b/mcabber/configure.ac Mon Nov 04 21:48:04 2013 +0100 @@ -160,6 +160,13 @@ [Define that loudmouth has lm_ssl_cipher_list] ) ) +# Check for lm_ssl_set_cipher_list in loudmouth +AC_CHECK_LIB(loudmouth-1, lm_ssl_set_ca, + AC_DEFINE([HAVE_LM_SSL_CA], 1, + [Define that loudmouth has lm_ssl_ca] + ) + ) + # Check for libidn AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]], diff -r a18e1b488f1c -r 91a8f3740a1a mcabber/mcabber/xmpp.c --- a/mcabber/mcabber/xmpp.c Fri Oct 25 22:20:23 2013 +0200 +++ b/mcabber/mcabber/xmpp.c Mon Nov 04 21:48:04 2013 +0100 @@ -1958,6 +1958,10 @@ const char *ssl_ciphers = settings_opt_get("ssl_ciphers"); lm_ssl_set_cipher_list(lssl, ssl_ciphers); #endif +#ifdef HAVE_LM_SSL_CA + const char *ssl_ca = settings_opt_get("ssl_ca"); + lm_ssl_set_ca(lssl, ssl_ca); +#endif lm_ssl_use_starttls(lssl, !ssl, tls); lm_connection_set_ssl(lconnection, lssl); lm_ssl_unref(lssl);