Changeset 164352e for lib/ssl_nss.c

Timestamp:

2011-12-24T18:02:39Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34ded90

Parents:

e306fbf (diff), 96f954d (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 mainline.

File:

• lib/ssl_nss.c (modified) (7 diffs)

lib/ssl_nss.c

@@ -52 +52 @@
         PRFileDesc *prfd;
         gboolean established;
+        gboolean verify;
 };
 
@@ -102 +103 @@
 }
 
-void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
+void *ssl_connect( char *host, int port, gboolean verify, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );
@@ -132 +133 @@
 }
 
-void *ssl_starttls( int fd, ssl_input_function func, gpointer data )
+void *ssl_starttls( int fd, char *hostname, gboolean verify, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );
@@ -139 +140 @@
         conn->func = func;
         conn->data = data;
+        conn->verify = verify && global.conf->cafile;
 
         /* This function should be called via a (short) timeout instead of
@@ -157 +159 @@
 {
         struct scd *conn = data;
+        
+        /* Right now we don't have any verification functionality for NSS. */
+
+        if( conn->verify )
+        {
+                conn->func( conn->data, 1, NULL, cond );
+                if( source >= 0 ) closesocket( source );
+                g_free( conn );
+
+                return FALSE;
+        }
         
         if( source == -1 )
@@ -177 +190 @@
         
         conn->established = TRUE;
-        conn->func( conn->data, conn, cond );
+        conn->func( conn->data, 0, conn, cond );
         return FALSE;
         
         ssl_connected_failure:
         
-        conn->func( conn->data, NULL, cond );
+        conn->func( conn->data, 0, NULL, cond );
         
         PR_Close( conn -> prfd );
@@ -238 +251 @@
         return B_EV_IO_READ;
 }
+
+char *ssl_verify_strerror( int code )
+{
+        return g_strdup( "SSL certificate verification not supported by BitlBee NSS code." );
+}