1 files changed, 7 insertions, 0 deletions
diff --git a/unix.c b/unix.c
index 07cb709f..cbd5c15d 100644
--- a/unix.c
+++ b/unix.c
@@ -30,6 +30,7 @@
 #include "protocols/nogaim.h"
 #include "help.h"
 #include "ipc.h"
+#include "lib/ssl_client.h"
 #include <signal.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -54,6 +55,12 @@ int main( int argc, char *argv[], char **envp )
 	
 	b_main_init();
 	nogaim_init();
+	/* Ugly Note: libotr and gnutls both use libgcrypt. libgcrypt
+	   has a process-global config state whose initialization happpens
+	   twice if libotr and gnutls are used together. libotr installs custom
+	   memory management functions for libgcrypt while our gnutls module
+	   uses the defaults. Therefore we initialize OTR after SSL. *sigh* */
+	ssl_init();
 	otr_init();
 	
 	srand( time( NULL ) ^ getpid() );