[xmppd-dev] commit r1527 - in branches/RELEASE-1_6_1: . jabberd man

[mail at jabberd.org]

Author: mawis
Date: Mon May  5 02:06:00 2008
New Revision: 1527

Log:
Removing GnuTLS/OpenPGP trustdb support, as this is not supported by newer versions of GnuTLS anymore.


Modified:
   branches/RELEASE-1_6_1/ChangeLog
   branches/RELEASE-1_6_1/jabberd/mio_tls.cc
   branches/RELEASE-1_6_1/man/jabber.xml.5.in

Modified: branches/RELEASE-1_6_1/ChangeLog
==============================================================================
--- branches/RELEASE-1_6_1/ChangeLog	(original)
+++ branches/RELEASE-1_6_1/ChangeLog	Mon May  5 02:06:00 2008
@@ -1,3 +1,7 @@
+2008-05-05  Matthias Wimmer  <m at tthias.eu>
+
+    * jabberd/mio_tls.cc: patch by Martin Matuschka to support newer GnuTLS
+
 2007-11-20  Matthias Wimmer  <m at tthias.eu>
 
     * jabberd/jabberd.h: dynamically update the routing across instances

Modified: branches/RELEASE-1_6_1/jabberd/mio_tls.cc
==============================================================================
--- branches/RELEASE-1_6_1/jabberd/mio_tls.cc	(original)
+++ branches/RELEASE-1_6_1/jabberd/mio_tls.cc	Mon May  5 02:06:00 2008
@@ -612,7 +612,7 @@
 	    }
 
 	    // load OpenPGP key/certificate
-	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
+	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64);
 	    if (ret < 0) {
 		log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
 		continue;
@@ -631,7 +631,7 @@
 	    }
 
 	    // load the OpenPGP keyring
-	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
+	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64);
 	    if (ret < 0) {
 		log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
 		continue;
@@ -640,23 +640,6 @@
 	    continue;
 	}
 
-	// load GnuPG trustdb
-	if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) {
-	    char const *const file = xmlnode_get_data(cur);
-
-	    if (file == NULL) {
-		log_warn(NULL, "Initializing TLS subsystem: <trustdb/> element inside the TLS configuration, that does not contain a file-name.");
-		continue;
-	    }
-
-	    // load the GnuPG trustdb
-	    ret = gnutls_certificate_set_openpgp_trustdb(current_credentials, file);
-	    if (ret < 0) {
-		log_error(NULL, "Error loading GnuPG trustdb %s: %s", file, gnutls_strerror(ret));
-		continue;
-	    }
-	}
-
 	// setup protocols to use
 	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
 	    char const *const protocols_data = xmlnode_get_data(cur);

Modified: branches/RELEASE-1_6_1/man/jabber.xml.5.in
==============================================================================
--- branches/RELEASE-1_6_1/man/jabber.xml.5.in	(original)
+++ branches/RELEASE-1_6_1/man/jabber.xml.5.in	Mon May  5 02:06:00 2008
@@ -1,4 +1,4 @@
-.TH jabber.xml 5 "02 Apr 2007" "@VERSION@" "jabberd14 project"
+.TH jabber.xml 5 "05 May 2008" "@VERSION@" "jabberd14 project"
 .SH NAME
 jabber.xml \- jabberd daemon configuration file
 .SH SYNOPSIS
@@ -361,10 +361,6 @@
 Load an OpenPGP keyring from the file specified using the content of this
 element.
 .TP
-.B TLS setting: cfg:jabber/cfg:io/cfg:tls/cfg:credentials/cfg:trustdb
-Load a GnuPG trust database from the file specified using the content of
-this element.
-.TP
 .B TLS setting: cfg:jabber/cfg:io/cfg:tls/cfg:credentials/cfg:protocols
 This setting is used to specify which version of the TLS protocol should be
 used and in which order they should be prefered. If you omit this setting,