Changeset 42127dc for lib

Timestamp:

2006-09-24T11:57:45Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e101506

Parents:

172a73f1

Message:

Added support for SSL- and TLS-connections. Checking of the "tls" user
setting has to be finished, plus an ssl_starttls() function for the other
SSL libraries (this code will only compile with GnuTLS for now).

Location:

lib

Files:

• ssl_client.h (modified) (1 diff)
• ssl_gnutls.c (modified) (2 diffs)

lib/ssl_client.h

@@ -52 +52 @@
 G_MODULE_EXPORT void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data );
 
+/* Start an SSL session on an existing fd. Useful for STARTTLS functionality,
+   for example in Jabber. */
+G_MODULE_EXPORT void *ssl_starttls( int fd, ssl_input_function func, gpointer data );
+
 /* Obviously you need special read/write functions to read data. */
 G_MODULE_EXPORT int ssl_read( void *conn, char *buf, int len );

lib/ssl_gnutls.c

@@ -63 +63 @@
         {
                 g_free( conn );
-                return( NULL );
+                return NULL;
+        }
+        
+        return conn;
+}
+
+/* FIXME: It can happen that the handshake fails even before ssl_connected()
+   returns already. This function will then return an invalid pointer because
+   these failures can't be detected properly yet. Maybe ssl_connected()
+   shouldn't be called directly, but via a short timeout? */
+void *ssl_starttls( int fd, ssl_input_function func, gpointer data )
+{
+        struct scd *conn = g_new0( struct scd, 1 );
+        
+        conn->fd = fd;
+        conn->func = func;
+        conn->data = data;
+        conn->inpa = -1;
+        
+        ssl_connected( conn, fd, GAIM_INPUT_WRITE );
+        
+        return conn;
+}
+
+static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
+
+static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
+{
+        struct scd *conn = data;
+        
+        if( source == -1 )
+        {
+                conn->func( conn->data, NULL, cond );
+                
+                g_free( conn );
+                
+                return FALSE;
         }
         
@@ -77 +113 @@
         gnutls_set_default_priority( conn->session );
         gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, conn->xcred );
-        
-        return( conn );
-}
-
-static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
-
-static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
-{
-        struct scd *conn = data;
-        
-        if( source == -1 )
-        {
-                conn->func( conn->data, NULL, cond );
-                
-                gnutls_deinit( conn->session );
-                gnutls_certificate_free_credentials( conn->xcred );
-                
-                g_free( conn );
-                
-                return FALSE;
-        }
         
         sock_make_nonblocking( conn->fd );