Merging OTR branch. It's more or less a plugin if you enable it, and

otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/ssl_openssl.c b/lib/ssl_openssl.c
index e0143791..64bc9257 100644
--- a/lib/ssl_openssl.c
+++ b/lib/ssl_openssl.c
@@ -56,6 +56,13 @@ static gboolean ssl_starttls_real( gpointer data, gint source, b_input_condition
 static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
 
 
+void ssl_init( void )
+{
+	initialized = TRUE;
+	SSL_library_init();
+	// SSLeay_add_ssl_algorithms();
+}
+
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
 	struct scd *conn = g_new0( struct scd, 1 );
@@ -114,10 +121,7 @@ static gboolean ssl_connected( gpointer data, gint source, b_input_condition con
 	
 	if( !initialized )
 	{
-		initialized = TRUE;
-		SSL_library_init();
-		//SSLeay_add_ssl_algorithms();
-		//OpenSSL_add_all_algorithms();
+		ssl_init();
 	}
 	
 	meth = TLSv1_client_method();