changeset 2089:91a8f3740a1a

Added setting "ssl_ca" to set additional certificates to trust
author franky
date Mon, 04 Nov 2013 21:48:04 +0100
parents a18e1b488f1c
children 16b04d64ec88
files mcabber/configure.ac mcabber/mcabber/xmpp.c
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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]],
--- 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);