Changeset 792a93b for protocols/jabber/io.c

Timestamp:

2011-12-23T12:44:08Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

200e151

Parents:

2d93a51e (diff), 41658da (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:

Merging SSL certificate verification for GnuTLS, with help from AopicieR.

File:

• protocols/jabber/io.c (modified) (4 diffs)

protocols/jabber/io.c

@@ -279 +279 @@
 }
 
-gboolean jabber_connected_ssl( gpointer data, void *source, b_input_condition cond )
+gboolean jabber_connected_ssl( gpointer data, int returncode, void *source, b_input_condition cond )
 {
         struct im_connection *ic = data;
@@ -295 +295 @@
                 jd->ssl = NULL;
                 
-                imcb_error( ic, "Could not connect to server" );
-                imc_logout( ic, TRUE );
+                if( returncode != 0 )
+                {
+                        char *err = ssl_verify_strerror( returncode );
+                        imcb_error( ic, "Certificate verification problem 0x%x: %s",
+                                    returncode, err ? err : "Unknown" );
+                        g_free( err );
+                        imc_logout( ic, FALSE );
+                }
+                else
+                {
+                        imcb_error( ic, "Could not connect to server" );
+                        imc_logout( ic, TRUE );
+                }
+                
                 return FALSE;
         }
@@ -400 +412 @@
         struct im_connection *ic = data;
         struct jabber_data *jd = ic->proto_data;
-        char *xmlns;
+        char *xmlns, *tlsname;
         
         xmlns = xt_find_attr( node, "xmlns" );
@@ -426 +438 @@
         
         jd->flags |= JFLAG_STARTTLS_DONE;
-        jd->ssl = ssl_starttls( jd->fd, jabber_connected_ssl, ic );
+
+        /* If the user specified a server for the account, use this server as the 
+         * hostname in the certificate verification. Else we use the domain from 
+         * the username. */
+        if( ic->acc->server && *ic->acc->server )
+                tlsname = ic->acc->server;
+        else
+                tlsname = jd->server;
+        
+        jd->ssl = ssl_starttls( jd->fd, tlsname, set_getbool( &ic->acc->set, "tls_verify" ),
+                                jabber_connected_ssl, ic );
         
         return XT_HANDLED;