aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl_nss.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-10-09 11:41:19 -0700
committerWilmer van der Gaast <wilmer@gaast.net>2010-10-09 11:41:19 -0700
commit619770237590e4a760346f2e12681d7e2220dda4 (patch)
tree8d0d391407280ab74e1fc876d6f272110b474897 /lib/ssl_nss.c
parent23b29c67968f3dd39e7d6970acc5669556f4c8b9 (diff)
parent27b407fde1844a0e03f1a9d92d2a1c4a40435f9b (diff)
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.
Diffstat (limited to 'lib/ssl_nss.c')
-rw-r--r--lib/ssl_nss.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/ssl_nss.c b/lib/ssl_nss.c
index de6e7ec6..b0e2f9f9 100644
--- a/lib/ssl_nss.c
+++ b/lib/ssl_nss.c
@@ -90,6 +90,14 @@ static SECStatus nss_bad_cert (void *arg, PRFileDesc *socket)
}
+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 )
{
struct scd *conn = g_new0( struct scd, 1 );
@@ -106,9 +114,7 @@ void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data
if( !initialized )
{
- PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
- NSS_NoDB_Init(NULL);
- NSS_SetDomesticPolicy();
+ ssl_init();
}