Enable socket_wrapper and nss_wrapper support for tests

Uncomment the socket_wrapper and nss_wrapper checks in configure.ac and add custom GnuTLS push/pull functions to work better with socket_wrapper. Update test environment to use cwrap_test when both wrappers are available.

Author: yoe

configure.ac

@@ -264,9 +264,9 @@ AC_CHECK_HEADERS([sys/mount.h],,,
 ]])
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h syslog.h linux/types.h sys/dirent.h sys/uio.h])
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.32.0 gthread-2.0 >= 2.32.0], [HAVE_GLIB=yes], AC_MSG_ERROR([Missing glib]))
-#PKG_CHECK_MODULES(SW, [socket_wrapper], [HAVE_SW=yes], [HAVE_SW=no])
-#PKG_CHECK_MODULES(NW, [nss_wrapper], [HAVE_NW=yes], [HAVE_NW=no])
-#AM_CONDITIONAL(CWRAP, test "$HAVE_SW" = "yes" -a "$HAVE_NW" = "yes")
+PKG_CHECK_MODULES(SW, [socket_wrapper], [HAVE_SW=yes], [HAVE_SW=no])
+PKG_CHECK_MODULES(NW, [nss_wrapper], [HAVE_NW=yes], [HAVE_NW=no])
+AM_CONDITIONAL(CWRAP, test "$HAVE_SW" = "yes" -a "$HAVE_NW" = "yes")
 
 my_save_cflags="$CFLAGS"
 my_save_libs="$LIBS"

crypto-gnutls.c

@@ -67,6 +67,15 @@ struct tlssession
 #define BUF_SIZE 65536
 #define BUF_HWM ((BUF_SIZE*3)/4)
 
+/* Custom push/pull functions for GnuTLS to handle socket wrapper better */
+static inline ssize_t custom_gnutls_push(gnutls_transport_ptr_t ptr, const void *data, size_t len) {
+    return write((int)(intptr_t)ptr, data, len);
+}
+
+static inline ssize_t custom_gnutls_pull(gnutls_transport_ptr_t ptr, void *data, size_t len) {
+    return read((int)(intptr_t)ptr, data, len);
+}
+
 static int
 falsequit (void *opaque)
 {
@@ -374,9 +383,11 @@ tlssession_mainloop (int cryptfd, int plainfd, tlssession_t * s)
       goto error;
     }
 
-  /* set it up to work with our FD */
+  /* set it up to work with our FD using custom push/pull functions */
   gnutls_transport_set_ptr (s->session,
 			    (gnutls_transport_ptr_t) (intptr_t) cryptfd);
+  gnutls_transport_set_push_function (s->session, custom_gnutls_push);
+  gnutls_transport_set_pull_function (s->session, custom_gnutls_pull);
 
 
   /* Now do the handshake */

tests/run/Makefile.am

@@ -3,11 +3,11 @@ TLSSRC = $(top_srcdir)/crypto-gnutls.c $(top_srcdir)/crypto-gnutls.h $(top_srcdi
 else
 TLSSRC =
 endif
-#if CWRAP
-#TESTS_ENVIRONMENT=$(srcdir)/cwrap_test
-#else
+if CWRAP
+TESTS_ENVIRONMENT=$(srcdir)/cwrap_test
+else
 TESTS_ENVIRONMENT=$(srcdir)/simple_test
-#endif
+endif
 TESTS = cfg1 cfgmulti cfgnew cfgsize write flush integrity dirconfig list inetd \
 	rowrite tree rotree unix integrityhuge handshake tls tlswrongcert tlshuge \
 	connstatus nlconnect