Changeset b006464 for lib

Timestamp:

2012-11-17T23:51:21Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5aa96fc8

Parents:

d1356cb (diff), e1d3f98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

Location:

lib

Files:

• ssl_bogus.c (deleted)
• ssl_gnutls.c (modified) (3 diffs)

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 )