Ticket #369: memory-fix.diff

lib/ssl_bogus.c

@@ -31 +31 @@
 {
 }
 
+void ssl_deinit( void )
+{
+}
+
 void *ssl_connect( char *host, int port, gboolean verify, ssl_input_function func, gpointer data )
 {
         return( NULL );

lib/ssl_client.h

@@ -57 +57 @@
 
 /* Perform any global initialization the SSL library might need. */
 G_MODULE_EXPORT void ssl_init( void );
+G_MODULE_EXPORT void ssl_deinit( void );
 
 /* Connect to host:port, call the given function when the connection is
    ready to be used for SSL traffic. This is all done asynchronously, no

lib/ssl_gnutls.c

@@ -37 +37 @@
 int ssl_errno = 0;
 
 static gboolean initialized = FALSE;
+gnutls_certificate_credentials xcred;
 
 #include <limits.h>
 
@@ -59 +60 @@
         gboolean verify;
         
         gnutls_session session;
-        gnutls_certificate_credentials xcred;
 };
 
 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 );
 static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
 
-
 void ssl_init( void )
 {
         if( initialized )
                 return;
         
         gnutls_global_init();
+        gnutls_certificate_allocate_credentials( &xcred );
+        if( global.conf->cafile )
+        {
+                gnutls_certificate_set_x509_trust_file( xcred, global.conf->cafile, GNUTLS_X509_FMT_PEM );
+                /* TODO: Do we want/need this? */
+                gnutls_certificate_set_verify_flags( xcred, GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT );
+        }
         initialized = TRUE;
-        atexit( gnutls_global_deinit );
+}
+
+void ssl_deinit (void) 
+{
+        gnutls_global_deinit();
+        gnutls_certificate_free_credentials( xcred );
 }
 
 void *ssl_connect( char *host, int port, gboolean verify, ssl_input_function func, gpointer data )
@@ -244 +255 @@
         
         ssl_init();
         
-        gnutls_certificate_allocate_credentials( &conn->xcred );
-        if( conn->verify && global.conf->cafile )
-        {
-                gnutls_certificate_set_x509_trust_file( conn->xcred, global.conf->cafile, GNUTLS_X509_FMT_PEM );
-                gnutls_certificate_set_verify_flags( conn->xcred, GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT );
-        }
-
         gnutls_init( &conn->session, GNUTLS_CLIENT );
         if( conn->verify )
                 gnutls_session_set_ptr( conn->session, (void *) conn->hostname );
@@ -258 +262 @@
         gnutls_transport_set_lowat( conn->session, 0 );
 #endif
         gnutls_set_default_priority( conn->session );
-        gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, conn->xcred );
+        gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, xcred );
         
         sock_make_nonblocking( conn->fd );
         gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) GNUTLS_STUPID_CAST conn->fd );
@@ -283 +287 @@
                         conn->func( conn->data, 0, NULL, cond );
                         
                         gnutls_deinit( conn->session );
-                        gnutls_certificate_free_credentials( conn->xcred );
                         closesocket( conn->fd );
                         
                         g_free( conn );
@@ -296 +299 @@
                         conn->func( conn->data, stver, NULL, cond );
 
                         gnutls_deinit( conn->session );
-                        gnutls_certificate_free_credentials( conn->xcred );
                         closesocket( conn->fd );
 
                         g_free( conn );
@@ -384 +386 @@
         
         if( conn->session )
                 gnutls_deinit( conn->session );
-        if( conn->xcred )
-                gnutls_certificate_free_credentials( conn->xcred );
         g_free( conn );
 }
 

lib/ssl_nss.c

@@ -102 +102 @@
         initialized = TRUE;
 }
 
+void ssl_deinit( void )
+{
+}
+
 void *ssl_connect( char *host, int port, gboolean verify, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );

lib/ssl_openssl.c

@@ -29 +29 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include "bitlbee.h"
 
 #include "proxy.h"
 #include "ssl_client.h"
@@ -64 +65 @@
         // SSLeay_add_ssl_algorithms();
 }
 
+void ssl_deinit( void )
+{
+}
+
 void *ssl_connect( char *host, int port, gboolean verify, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );

unix.c

@@ -184 +184 @@
         
         /* Mainly good for restarting, to make sure we close the help.txt fd. */
         help_free( &global.help );
+
+        ssl_deinit();
         
         if( global.restart )
         {