From ba5add72f824504a21eb780cae638c3ea2166ba0 Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Sun, 17 Feb 2008 02:39:39 +0100 Subject: explicitly initialize ssl in order to avoid gnutls and libotr fighting over the global state of libgcrypt --- unix.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'unix.c') 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 #include #include @@ -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() ); -- cgit v1.2.3