Changeset ba5add7 for lib

Timestamp:

2008-02-17T01:39:39Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

82e8fe8

Parents:

fd9fa52

Message:

explicitly initialize ssl in order to avoid gnutls and libotr fighting over the global state of libgcrypt

Location:

lib

Files:

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

lib/ssl_bogus.c

@@ -27 +27 @@
 
 int ssl_errno;
+
+void ssl_init( void )
+{
+}
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )

lib/ssl_client.h

@@ -47 +47 @@
 
 
+/* Perform any global initialization the SSL library might need. */
+G_MODULE_EXPORT void ssl_init( 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

@@ -60 +60 @@
 static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
 
+
+void ssl_init( void )
+{
+        gnutls_global_init();
+        initialized = TRUE;
+        atexit( gnutls_global_deinit );
+}
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
@@ -122 +129 @@
         if( !initialized )
         {
-                gnutls_global_init();
-                initialized = TRUE;
-                atexit( gnutls_global_deinit );
+                ssl_init();
         }
         

lib/ssl_nss.c

@@ -91 +91 @@
 
 
+void ssl_init( void )
+{
+        PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
+        NSS_NoDB_Init(NULL);
+        NSS_SetDomesticPolicy();
+        initialized = TRUE;
+}
+
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
@@ -107 +115 @@
         if( !initialized )
         {
-                PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
-                NSS_NoDB_Init(NULL);
-                NSS_SetDomesticPolicy();
+                ssl_init();
         }
 

lib/ssl_openssl.c

@@ -56 +56 @@
 static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
 
+
+void ssl_init( void );
+{
+        initialized = TRUE;
+        SSLeay_add_ssl_algorithms();
+}
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
@@ -115 +121 @@
         if( !initialized )
         {
-                initialized = TRUE;
-                SSLeay_add_ssl_algorithms();
+                ssl_init();
         }