Changeset 6197702 for lib/ssl_nss.c

Timestamp:

2010-10-09T18:41:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d150a9d

Parents:

23b29c6 (diff), 27b407f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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.

File:

• lib/ssl_nss.c (modified) (2 diffs)

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();
         }