Changeset ef043d3

Timestamp:

2010-11-20T15:13:40Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1074806

Parents:

6d544a1

Message:

Fix up NSS SSL module.

Files:

• configure (modified) (1 diff)
• lib/ssl_nss.c (modified) (3 diffs)

configure

@@ -289 +289 @@
 detect_nss()
 {
-        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG mozilla-nss; then
+        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG nss; then
                 cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs mozilla-nss`
-CFLAGS+=`$PKG_CONFIG --cflags mozilla-nss`
+EFLAGS+=`$PKG_CONFIG --libs nss`
+CFLAGS+=`$PKG_CONFIG --cflags nss`
 EOF
                 

lib/ssl_nss.c

@@ -34 +34 @@
 #include <sslproto.h>
 #include <nss.h>
+#include <pk11pub.h>
 #include <private/pprio.h>
 #include <ssl.h>
+#include <seccomon.h>
 #include <secerr.h>
 #include <sslerr.h>
@@ -53 +55 @@
 
 static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
+static gboolean ssl_starttls_real( gpointer data, gint source, b_input_condition cond );
 
 
@@ -122 +125 @@
 }
 
+static gboolean ssl_starttls_real( gpointer data, gint source, b_input_condition cond )
+{
+        struct scd *conn = data;
+
+        return ssl_connected( conn, conn->fd, B_EV_IO_WRITE );
+}
+
+void *ssl_starttls( int fd, ssl_input_function func, gpointer data )
+{
+        struct scd *conn = g_new0( struct scd, 1 );
+
+        conn->fd = fd;
+        conn->func = func;
+        conn->data = data;
+
+        /* This function should be called via a (short) timeout instead of
+           directly from here, because these SSL calls are *supposed* to be
+           *completely* asynchronous and not ready yet when this function
+           (or *_connect, for examle) returns. Also, errors are reported via
+           the callback function, not via this function's return value.
+
+           In short, doing things like this makes the rest of the code a lot
+           simpler. */
+
+        b_timeout_add( 1, ssl_starttls_real, conn );
+
+        return conn;
+}
+
 static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
 {