Changes in lib/ssl_openssl.c [59c03bd:def3650]

File:

• lib/ssl_openssl.c (modified) (12 diffs)

lib/ssl_openssl.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2012 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -47 +47 @@
         gboolean established;
         gboolean verify;
+        char *hostname;
         
         int inpa;
         int lasterr;            /* Necessary for SSL_get_error */
         SSL *ssl;
-        SSL_CTX *ssl_ctx;
 };
 
+static SSL_CTX *ssl_ctx;
+
+static void ssl_conn_free( struct scd *conn );
 static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
 static gboolean ssl_starttls_real( gpointer data, gint source, b_input_condition cond );
@@ -61 +64 @@
 void ssl_init( void )
 {
+        const SSL_METHOD *meth;
+        
+        SSL_library_init();
+        
+        meth = TLSv1_client_method();
+        ssl_ctx = SSL_CTX_new( meth );
+        
         initialized = TRUE;
-        SSL_library_init();
-        // SSLeay_add_ssl_algorithms();
 }
 
@@ -73 +81 @@
         if( conn->fd < 0 )
         {
-                g_free( conn );
+                ssl_conn_free( conn );
                 return NULL;
         }
@@ -80 +88 @@
         conn->data = data;
         conn->inpa = -1;
+        conn->hostname = g_strdup( host );
         
         return conn;
@@ -93 +102 @@
         conn->inpa = -1;
         conn->verify = verify && global.conf->cafile;
+        conn->hostname = g_strdup( hostname );
         
         /* This function should be called via a (short) timeout instead of
@@ -118 +128 @@
 {
         struct scd *conn = data;
-        const SSL_METHOD *meth;
-        
-        /* Right now we don't have any verification functionality for OpenSSL. */
-
+        
         if( conn->verify )
         {
+                /* Right now we don't have any verification functionality for OpenSSL. */
                 conn->func( conn->data, 1, NULL, cond );
                 if( source >= 0 ) closesocket( source );
-                g_free( conn );
+                ssl_conn_free( conn );
 
                 return FALSE;
@@ -139 +147 @@
         }
         
-        meth = TLSv1_client_method();
-        conn->ssl_ctx = SSL_CTX_new( meth );
-        if( conn->ssl_ctx == NULL )
+        
+        if( ssl_ctx == NULL )
                 goto ssl_connected_failure;
         
-        conn->ssl = SSL_new( conn->ssl_ctx );
+        conn->ssl = SSL_new( ssl_ctx );
         if( conn->ssl == NULL )
                 goto ssl_connected_failure;
@@ -152 +159 @@
         SSL_set_fd( conn->ssl, conn->fd );
         
+        if( conn->hostname && !isdigit( conn->hostname[0] ) )
+                SSL_set_tlsext_host_name( conn->ssl, conn->hostname );
+        
         return ssl_handshake( data, source, cond );
 
 ssl_connected_failure:
         conn->func( conn->data, 0, NULL, cond );
-        
-        if( conn->ssl )
-        {
-                SSL_shutdown( conn->ssl );
-                SSL_free( conn->ssl );
-        }
-        if( conn->ssl_ctx )
-        {
-                SSL_CTX_free( conn->ssl_ctx );
-        }
-        if( source >= 0 ) closesocket( source );
-        g_free( conn );
-        
+        ssl_disconnect( conn );
         return FALSE;
 
@@ -184 +182 @@
                 {
                         conn->func( conn->data, 0, NULL, cond );
-                        
-                        SSL_shutdown( conn->ssl );
-                        SSL_free( conn->ssl );
-                        SSL_CTX_free( conn->ssl_ctx );
-                        
-                        if( source >= 0 ) closesocket( source );
-                        g_free( conn );
-                        
+                        ssl_disconnect( conn );
                         return FALSE;
                 }
@@ -261 +252 @@
 }
 
+static void ssl_conn_free( struct scd *conn )
+{
+        SSL_free( conn->ssl );
+        g_free( conn->hostname );
+        g_free( conn );
+        
+}
+
 void ssl_disconnect( void *conn_ )
 {
@@ -273 +272 @@
         closesocket( conn->fd );
         
-        SSL_free( conn->ssl );
-        SSL_CTX_free( conn->ssl_ctx );
-        g_free( conn );
+        ssl_conn_free( conn );
 }