Changeset 8f976e6

Timestamp:

2012-10-30T23:41:43Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

536dfa1

Parents:

addad71

Message:

SSL fixes from Michal Suchanek.

Files:

• lib/ssl_gnutls.c (modified) (3 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)

lib/ssl_gnutls.c

@@ -85 +85 @@
                 gnutls_certificate_set_x509_trust_file( xcred, global.conf->cafile, GNUTLS_X509_FMT_PEM );
                 
-                /* Not needed in GnuTLS 2.11+ but we support older versions for now. */
-                gnutls_certificate_set_verify_flags( xcred, GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT );
+                /* Not needed in GnuTLS 2.11+ (enabled by default there) so
+                   don't do it (resets possible other defaults). */
+                if( !gnutls_check_version( "2.11" ) )
+                        gnutls_certificate_set_verify_flags( xcred, GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT );
         }
         initialized = TRUE;
@@ -108 +110 @@
         struct scd *conn = g_new0( struct scd, 1 );
         
-        conn->fd = proxy_connect( host, port, ssl_connected, conn );
         conn->func = func;
         conn->data = data;
@@ -114 +115 @@
         conn->hostname = g_strdup( host );
         conn->verify = verify && global.conf->cafile;
+        conn->fd = proxy_connect( host, port, ssl_connected, conn );
         
         if( conn->fd < 0 )

protocols/jabber/jabber.c

@@ -231 +231 @@
         if( set_getbool( &acc->set, "ssl" ) )
         {
-                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), FALSE, jabber_connected_ssl, ic );
+                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), set_getbool( &acc->set, "tls_verify" ), jabber_connected_ssl, ic );
                 jd->fd = jd->ssl ? ssl_getfd( jd->ssl ) : -1;
         }