17 files changed, 65 insertions, 315 deletions

diff --git a/src/daemon/https/Makefile.am b/src/daemon/https/Makefile.am
index ec37f95b..4725c405 100644
--- a/src/daemon/https/Makefile.am
+++ b/src/daemon/https/Makefile.am
@@ -1,19 +1,18 @@
 SUBDIRS = minitasn1 opencdk openpgp lgl x509 tls . 
 
-AM_CPPFLAGS = -I./includes \
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include \
+-I$(top_srcdir)/src/daemon/https/tls \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/x509 \
 -I$(top_srcdir)/src/daemon/https/openpgp \
 -I$(top_srcdir)/src/daemon/https/opencdk \
--I$(top_srcdir)/src/daemon/https/tls \
--I$(top_srcdir)/src/daemon/https/includes \
--I$(top_srcdir)/src/daemon/https/cfg 
+-I$(top_srcdir)/src/daemon/https/includes
 
 noinst_LTLIBRARIES = libhttps.la
 
 libhttps_la_SOURCES = \
-https_common.c \
-errcodes.c 
+https_common.c
 
 libhttps_la_LIBADD = \
 opencdk/libopencdk.la \
diff --git a/src/daemon/https/errcodes b/src/daemon/https/errcodes
deleted file mode 100644
index 65774f43..00000000
--- a/src/daemon/https/errcodes
+++ /dev/null
@@ -1,131 +0,0 @@
-#! /bin/sh
-
-# errcodes - temporary wrapper script for .libs/errcodes
-# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-3 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# The errcodes program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command="(cd /home/lama/workbench/programming/c/gnunet/gnutls-2.2.3/src; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/lib/distcc:/usr/local/bin:/usr/bin:/bin:/usr/games\"; export PATH; gcc -std=gnu99 -g -O2 -D_REENTRANT -D_THREAD_SAFE -pipe -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wno-pointer-sign -o \$progdir/\$file errcodes.o  ../lib/.libs/libgnutls.so /usr/lib/libgcrypt.so -L/usr/lib /usr/lib/libtasn1.so  -Wl,--rpath -Wl,/home/lama/workbench/programming/c/gnunet/gnutls-2.2.3/lib/.libs -Wl,--rpath -Wl,/home/lama/workbench/programming/c/gnunet/gnutls-2.2.3/build/lib ) "
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variable:
-  notinst_deplibs=' ../lib/libgnutls.la'
-else
-  # When we are sourced in execute mode, $file and $echo are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    echo="echo"
-    file="$0"
-    # Make sure echo works.
-    if test "X$1" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-      # Yippee, $echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe $echo will work.
-      exec /bin/sh "$0" --no-reexec ${1+"$@"}
-    fi
-  fi
-
-  # Find the directory that this script lives in.
-  thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'errcodes'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" || \
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-        echo "$relink_command_output" >&2
-        rm -f "$progdir/$file"
-        exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-
-      exec "$progdir/$program" ${1+"$@"}
-
-      $echo "$0: cannot exec $program $*"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    $echo "$0: error: \`$progdir/$program' does not exist" 1>&2
-    $echo "This script is just a wrapper for $program." 1>&2
-    echo "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi
diff --git a/src/daemon/https/errcodes.c b/src/daemon/https/errcodes.c
deleted file mode 100644
index 0177eccc..00000000
--- a/src/daemon/https/errcodes.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls.h>
-
-const char *_gnutls_strerror (int);
-
-typedef struct
-{
-  char name[128];
-  int error_index;
-} error_name;
-
-static int
-compar (const void *_n1, const void *_n2)
-{
-  const error_name *n1 = (const error_name *) _n1,
-    *n2 = (const error_name *) _n2;
-  return strcmp (n1->name, n2->name);
-}
diff --git a/src/daemon/https/includes/extra.h b/src/daemon/https/includes/extra.h
index ca0cb5b4..0c363259 100644
--- a/src/daemon/https/includes/extra.h
+++ b/src/daemon/https/includes/extra.h
@@ -27,9 +27,9 @@
  */
 
 #ifndef GNUTLS_EXTRA_H
-# define GNUTLS_EXTRA_H
+#define GNUTLS_EXTRA_H
 
-#include <gnutls.h>
+#include "gnutls.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -38,7 +38,7 @@ extern "C"
 
 #define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION
 
-/* Openpgp certificate stuff 
+/* Openpgp certificate stuff
  */
 
   typedef enum gnutls_openpgp_crt_fmt
@@ -175,7 +175,7 @@ extern "C"
 
   int gnutls_global_init_extra (void);
 
-/* returns libgnutls-extra version (call it with a NULL argument) 
+/* returns libgnutls-extra version (call it with a NULL argument)
  */
   const char *gnutls_extra_check_version (const char *req_version);
 
diff --git a/src/daemon/https/includes/gnutls.h b/src/daemon/https/includes/gnutls.h
index 5178609b..df34e72c 100644
--- a/src/daemon/https/includes/gnutls.h
+++ b/src/daemon/https/includes/gnutls.h
@@ -32,9 +32,8 @@
  * gcrypt.h
  */
 
-
 #ifndef GNUTLS_H
-# define GNUTLS_H
+#define GNUTLS_H
 
 #ifdef __cplusplus
 extern "C"
@@ -49,8 +48,6 @@ extern "C"
 
 #define LIBGNUTLS_VERSION_NUMBER 0x020203
 
-
-
 /* Get size_t. */
 #include <stddef.h>
 /* Get ssize_t. */
@@ -67,33 +64,7 @@ extern "C"
 #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
 
-  typedef enum gnutls_cipher_algorithm
-  {
-    GNUTLS_CIPHER_UNKNOWN = 0,
-    GNUTLS_CIPHER_NULL = 1,
-    GNUTLS_CIPHER_ARCFOUR_128,
-    GNUTLS_CIPHER_3DES_CBC,
-    GNUTLS_CIPHER_AES_128_CBC,
-    GNUTLS_CIPHER_AES_256_CBC,
-    GNUTLS_CIPHER_ARCFOUR_40,
-    GNUTLS_CIPHER_CAMELLIA_128_CBC,
-    GNUTLS_CIPHER_CAMELLIA_256_CBC,
-    GNUTLS_CIPHER_RC2_40_CBC = 90,
-    GNUTLS_CIPHER_DES_CBC
-  } gnutls_cipher_algorithm_t;
-
-  typedef enum
-  {
-    GNUTLS_KX_UNKNOWN = 0,
-    GNUTLS_KX_RSA = 1,
-    GNUTLS_KX_DHE_DSS,
-    GNUTLS_KX_DHE_RSA,
-    GNUTLS_KX_ANON_DH,
-    GNUTLS_KX_SRP,
-    GNUTLS_KX_RSA_EXPORT,
-    GNUTLS_KX_SRP_RSA,
-    GNUTLS_KX_SRP_DSS,
-  } gnutls_kx_algorithm_t;
+#include "microhttpsd.h"
 
   typedef enum
   {
@@ -101,57 +72,16 @@ extern "C"
     GNUTLS_PARAMS_DH
   } gnutls_params_type_t;
 
-  typedef enum
-  {
-    GNUTLS_CRD_CERTIFICATE = 1,
-    GNUTLS_CRD_ANON,
-    GNUTLS_CRD_SRP,
-    GNUTLS_CRD_PSK,
-    GNUTLS_CRD_IA
-  } gnutls_credentials_type_t;
-
+/* TODO clean
 #define GNUTLS_MAC_SHA GNUTLS_MAC_SHA1
 #define GNUTLS_DIG_SHA GNUTLS_DIG_SHA1
-
-  typedef enum
-  {
-    GNUTLS_MAC_UNKNOWN = 0,
-    GNUTLS_MAC_NULL = 1,
-    GNUTLS_MAC_MD5,
-    GNUTLS_MAC_SHA1,
-    //GNUTLS_MAC_RMD160,
-    //GNUTLS_MAC_MD2,
-    GNUTLS_MAC_SHA256,
-    //GNUTLS_MAC_SHA384,
-    //GNUTLS_MAC_SHA512
-  } gnutls_mac_algorithm_t;
-
-  /* The enumerations here should have the same value with
-     gnutls_mac_algorithm_t.
-   */
-  typedef enum
-  {
-    GNUTLS_DIG_NULL = GNUTLS_MAC_NULL,
-    GNUTLS_DIG_MD5 = GNUTLS_MAC_MD5,
-    GNUTLS_DIG_SHA1 = GNUTLS_MAC_SHA1,
-    GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256,
-  } gnutls_digest_algorithm_t;
+*/
 
   /* exported for other gnutls headers. This is the maximum number of
    * algorithms (ciphers, kx or macs).
    */
 #define GNUTLS_MAX_ALGORITHM_NUM 16
-
 #define GNUTLS_COMP_ZLIB GNUTLS_COMP_DEFLATE
-  typedef enum
-  {
-    GNUTLS_COMP_UNKNOWN = 0,
-    GNUTLS_COMP_NULL = 1,
-    GNUTLS_COMP_DEFLATE,
-    GNUTLS_COMP_LZO             /* only available if gnutls-extra has
-                                   been initialized
-                                 */
-  } gnutls_compression_method_t;
 
   typedef enum
   {
@@ -251,36 +181,12 @@ extern "C"
     GNUTLS_SHUT_WR = 1
   } gnutls_close_request_t;
 
-#define GNUTLS_TLS1 GNUTLS_TLS1_0
-  typedef enum
-  {
-    GNUTLS_SSL3 = 1,
-    GNUTLS_TLS1_0,
-    GNUTLS_TLS1_1,
-    GNUTLS_TLS1_2,
-    GNUTLS_VERSION_UNKNOWN = 0xff
-  } gnutls_protocol_t;
-
-  typedef enum
-  {
-    GNUTLS_CRT_UNKNOWN = 0,
-    GNUTLS_CRT_X509 = 1,
-    GNUTLS_CRT_OPENPGP
-  } gnutls_certificate_type_t;
-
   typedef enum
   {
     GNUTLS_X509_FMT_DER,
     GNUTLS_X509_FMT_PEM
   } gnutls_x509_crt_fmt_t;
 
-  typedef enum
-  {
-    GNUTLS_PK_UNKNOWN = 0,
-    GNUTLS_PK_RSA = 1,
-    //GNUTLS_PK_DSA
-  } gnutls_pk_algorithm_t;
-
   const char *gnutls_pk_algorithm_get_name (gnutls_pk_algorithm_t algorithm);
 
 #define GNUTLS_SIGN_RSA_SHA GNUTLS_SIGN_RSA_SHA1
diff --git a/src/daemon/https/lgl/Makefile.am b/src/daemon/https/lgl/Makefile.am
index 1edb75ae..ff8d1856 100644
--- a/src/daemon/https/lgl/Makefile.am
+++ b/src/daemon/https/lgl/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = . 
 
 AM_CPPFLAGS = -std=c99 \
+-I$(top_srcdir)/src/include \
 -I$(GCRYPT_CPPFLAGS)
 
 # gc-gnulib.c
diff --git a/src/daemon/https/minitasn1/Makefile.am b/src/daemon/https/minitasn1/Makefile.am
index fc924cc4..6c58730d 100644
--- a/src/daemon/https/minitasn1/Makefile.am
+++ b/src/daemon/https/minitasn1/Makefile.am
@@ -1,5 +1,6 @@
 
-AM_CPPFLAGS = -I./includes \
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/tls \
 -I$(top_srcdir)/src/daemon/https/includes 
diff --git a/src/daemon/https/opencdk/Makefile.am b/src/daemon/https/opencdk/Makefile.am
index b69a151f..b6e67470 100644
--- a/src/daemon/https/opencdk/Makefile.am
+++ b/src/daemon/https/opencdk/Makefile.am
@@ -1,4 +1,6 @@
-AM_CPPFLAGS = -I$(top_srcdir)/lib \
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include \
+-I$(top_srcdir)/lib \
 -I$(top_srcdir)/lgl \
 -I$(GCRYPT_CPPFLAGS)
 
diff --git a/src/daemon/https/openpgp/Makefile.am b/src/daemon/https/openpgp/Makefile.am
index 94c27ac1..66380444 100644
--- a/src/daemon/https/openpgp/Makefile.am
+++ b/src/daemon/https/openpgp/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = .
 
-AM_CPPFLAGS = -I./includes \
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include \
 -I$(top_srcdir)/src/daemon/https/includes \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/x509 \
diff --git a/src/daemon/https/tls/Makefile.am b/src/daemon/https/tls/Makefile.am
index ca847aa2..ceecb1ba 100644
--- a/src/daemon/https/tls/Makefile.am
+++ b/src/daemon/https/tls/Makefile.am
@@ -1,12 +1,13 @@
 SUBDIRS = .
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/daemon/https/includes \
+-I$(top_srcdir)/src/include \
+-I$(top_srcdir)/src/daemon/https/tls \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/x509 \
--I$(top_srcdir)/src/daemon/https/tls \
 -I$(top_srcdir)/src/daemon/https/openpgp \
 -I$(top_srcdir)/src/daemon/https/opencdk \
+-I$(top_srcdir)/src/daemon/https/includes \
 -I$(GCRYPT_CPPFLAGS)
 
 noinst_LTLIBRARIES = libtls.la
diff --git a/src/daemon/https/tls/defines.h b/src/daemon/https/tls/defines.h
index a53ce2e4..43e96766 100644
--- a/src/daemon/https/tls/defines.h
+++ b/src/daemon/https/tls/defines.h
@@ -48,7 +48,7 @@ typedef int ssize_t;
 #include <sys/socket.h>
 #include <time.h>
 
-// TODO check if these should go into config.h
+/* TODO check if these should go into config.h */
 #define SIZEOF_UNSIGNED_INT 4
 #define SIZEOF_UNSIGNED_LONG 8
 #define SIZEOF_UNSIGNED_LONG_INT SIZEOF_UNSIGNED_LONG
diff --git a/src/daemon/https/tls/gnutls_global.c b/src/daemon/https/tls/gnutls_global.c
index 822293ac..d244213e 100644
--- a/src/daemon/https/tls/gnutls_global.c
+++ b/src/daemon/https/tls/gnutls_global.c
@@ -60,10 +60,10 @@ ASN1_TYPE _gnutls_gnutls_asn;
  *
  * This is the function where you set the logging function gnutls
  * is going to use. This function only accepts a character array.
- * Normally you may not use this function since it is only used 
+ * Normally you may not use this function since it is only used
  * for debugging purposes.
  *
- * gnutls_log_func is of the form, 
+ * gnutls_log_func is of the form,
  * void (*gnutls_log_func)( int level, const char*);
  **/
 void
@@ -74,7 +74,7 @@ gnutls_global_set_log_function (gnutls_log_func log_func)
 
 /**
  * gnutls_global_set_log_level - This function sets the logging level
- * @level: it's an integer from 0 to 9. 
+ * @level: it's an integer from 0 to 9.
  *
  * This is the function that allows you to set the log level.
  * The level is an integer between 0 and 9. Higher values mean
@@ -90,15 +90,6 @@ gnutls_global_set_log_level (int level)
   _gnutls_log_level = level;
 }
 
-#ifdef DEBUG
-/* default logging function */
-static void
-dlog (int level, const char *str)
-{
-  fputs (str, stderr);
-}
-#endif
-
 extern gnutls_alloc_function gnutls_secure_malloc;
 extern gnutls_alloc_function gnutls_malloc;
 extern gnutls_free_function gnutls_free;
@@ -121,7 +112,7 @@ int _gnutls_is_secure_mem_null (const void *);
  * is going to use. By default the libc's allocation functions (malloc(), free()),
  * are used by gnutls, to allocate both sensitive and not sensitive data.
  * This function is provided to set the memory allocation functions to
- * something other than the defaults (ie the gcrypt allocation functions). 
+ * something other than the defaults (ie the gcrypt allocation functions).
  *
  * This function must be called before gnutls_global_init() is called.
  *
@@ -182,7 +173,7 @@ static int _gnutls_init = 0;
  *
  * Note that this function will also initialize libgcrypt, if it has not
  * been initialized before. Thus if you want to manually initialize libgcrypt
- * you must do it before calling this function. This is useful in cases you 
+ * you must do it before calling this function. This is useful in cases you
  * want to disable libgcrypt's internal lockings etc.
  *
  * This function increment a global counter, so that
@@ -209,7 +200,7 @@ gnutls_global_init (void)
   char c;
 
   if (_gnutls_init++)
-    return;
+    return 0;
 
 #if HAVE_WINSOCK
   {
@@ -235,7 +226,6 @@ gnutls_global_init (void)
   }
 #endif
 
-
   // bindtextdomain("mhd", "./");
 
   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P) == 0)
@@ -285,14 +275,13 @@ gnutls_global_init (void)
     }
 
 #ifdef DEBUG
-  gnutls_global_set_log_function (dlog);
+  gnutls_global_set_log_function (MHD_tls_log_func());
 #endif
 
-  /* initialize parser 
+  /* initialize parser
    * This should not deal with files in the final
    * version.
    */
-
   res = asn1_array2tree(pkix_asn1_tab, &_gnutls_pkix1_asn, NULL);
   if (res != ASN1_SUCCESS)
     {
@@ -315,7 +304,7 @@ gnutls_global_init (void)
 }
 
 /**
- * gnutls_global_deinit - This function deinitializes the global data 
+ * gnutls_global_deinit - This function deinitializes the global data
  *
  * This function deinitializes the global data, that were initialized
  * using gnutls_global_init().
@@ -339,7 +328,7 @@ gnutls_global_deinit (void)
   _gnutls_init--;
 }
 
-/* These functions should be elsewere. Kept here for 
+/* These functions should be elsewere. Kept here for
  * historical reasons.
  */
 
@@ -348,12 +337,12 @@ gnutls_global_deinit (void)
  * @pull_func: a callback function similar to read()
  * @session: gnutls session
  *
- * This is the function where you set a function for gnutls 
+ * This is the function where you set a function for gnutls
  * to receive data. Normally, if you use berkeley style sockets,
- * do not need to use this function since the default (recv(2)) will 
+ * do not need to use this function since the default (recv(2)) will
  * probably be ok.
  *
- * PULL_FUNC is of the form, 
+ * PULL_FUNC is of the form,
  * ssize_t (*gnutls_pull_func)(gnutls_transport_ptr_t, void*, size_t);
  **/
 void
@@ -373,8 +362,8 @@ gnutls_transport_set_pull_function (gnutls_session_t session,
  * sockets, you do not need to use this function since
  * the default (send(2)) will probably be ok. Otherwise you should
  * specify this function for gnutls to be able to send data.
- *  
- * PUSH_FUNC is of the form, 
+ *
+ * PUSH_FUNC is of the form,
  * ssize_t (*gnutls_push_func)(gnutls_transport_ptr_t, const void*, size_t);
  **/
 void
diff --git a/src/daemon/https/tls/gnutls_global.h b/src/daemon/https/tls/gnutls_global.h
index 3305ebad..05026a70 100644
--- a/src/daemon/https/tls/gnutls_global.h
+++ b/src/daemon/https/tls/gnutls_global.h
@@ -27,12 +27,15 @@
 
 #include <libtasn1.h>
 
+/* this mutex is used to synchronize threads attemting call gnutls_global_init / gnutls_global_deinit */
+pthread_mutex_t gnutls_init_mutex;
+
 int gnutls_is_secure_memory (const void *mem);
 
 extern ASN1_TYPE _gnutls_pkix1_asn;
 extern ASN1_TYPE _gnutls_gnutls_asn;
 
-/* removed const from node_asn* to 
+/* removed const from node_asn* to
  * prevent warnings, since libtasn1 doesn't
  * use the const keywork in its functions.
  */
diff --git a/src/daemon/https/tls/gnutls_int.h b/src/daemon/https/tls/gnutls_int.h
index c1e501a0..1bd6205d 100644
--- a/src/daemon/https/tls/gnutls_int.h
+++ b/src/daemon/https/tls/gnutls_int.h
@@ -23,12 +23,13 @@
  */
 
 #ifndef GNUTLS_INT_H
-
 #define GNUTLS_INT_H
 
 #include <defines.h>
 
 #include "gnutls.h"
+#include "microhttpsd.h"
+
 #include "extra.h"
 #include "gnutls_mem.h"
 
@@ -36,6 +37,8 @@
  */
 #define KEYRING_HACK
 
+#define MAX(X,Y) ((X) > (Y) ? (X) : (Y));
+
 #define MAX32 4294967295
 #define MAX24 16777215
 #define MAX16 65535
@@ -49,7 +52,7 @@
 #define TLS_MAX_SESSION_ID_SIZE 32
 #define TLS_MASTER_SIZE 48
 
-/* The maximum digest size of hash algorithms. 
+/* The maximum digest size of hash algorithms.
  */
 #define MAX_HASH_SIZE 64
 
@@ -112,7 +115,7 @@ typedef struct
 #include <gnutls_mpi.h>
 
 typedef enum change_cipher_spec_t
-  { 
+  {
     GNUTLS_TYPE_CHANGE_CIPHER_SPEC = 1
   } change_cipher_spec_t;
 
@@ -176,7 +179,7 @@ typedef struct auth_cred_st
   {
     gnutls_credentials_type_t algorithm;
 
-    /* the type of credentials depends on algorithm 
+    /* the type of credentials depends on algorithm
      */
     void *credentials;
     struct auth_cred_st *next;
@@ -202,9 +205,9 @@ struct gnutls_key_st
      */
     mpi_t rsa[2];
 
-    /* this is used to hold the peers authentication data 
+    /* this is used to hold the peers authentication data
      */
-    /* auth_info_t structures SHOULD NOT contain malloced 
+    /* auth_info_t structures SHOULD NOT contain malloced
      * elements. Check gnutls_session_pack.c, and gnutls_auth.c.
      * Rememember that this should be calloced!
      */
@@ -287,13 +290,13 @@ typedef enum tls_ext_parse_type_t
     EXTENSION_TLS
   } tls_ext_parse_type_t;
 
-/* auth_info_t structures now MAY contain malloced 
+/* auth_info_t structures now MAY contain malloced
  * elements.
  */
 
 /* This structure and auth_info_t, are stored in the resume database,
  * and are restored, in case of resume.
- * Holds all the required parameters to resume the current 
+ * Holds all the required parameters to resume the current
  * session.
  */
 
@@ -321,7 +324,7 @@ typedef struct
     gnutls_mac_algorithm_t write_mac_algorithm;
     gnutls_compression_method_t write_compression_algorithm;
 
-    /* this is the ciphersuite we are going to use 
+    /* this is the ciphersuite we are going to use
      * moved here from internals in order to be restored
      * on resume;
      */
@@ -511,7 +514,7 @@ typedef struct
 
     /* this is the highest version available
      * to the peer. (advertized version).
-     * This is obtained by the Handshake Client Hello 
+     * This is obtained by the Handshake Client Hello
      * message. (some implementations read the Record version)
      */
     uint8_t adv_version_major;
@@ -523,8 +526,8 @@ typedef struct
      */
     int send_cert_req;
 
-    /* bits to use for DHE and DHA 
-     * use _gnutls_dh_get_prime_bits() and gnutls_dh_set_prime_bits() 
+    /* bits to use for DHE and DHA
+     * use _gnutls_dh_get_prime_bits() and gnutls_dh_set_prime_bits()
      * to access it.
      */
     uint16_t dh_prime_bits;
diff --git a/src/daemon/https/tls/gnutls_str.h b/src/daemon/https/tls/gnutls_str.h
index c805d70f..62415557 100644
--- a/src/daemon/https/tls/gnutls_str.h
+++ b/src/daemon/https/tls/gnutls_str.h
@@ -23,12 +23,10 @@
  */
 
 #ifndef GNUTLS_STR_H
-# define GNUTLS_STR_H
+#define GNUTLS_STR_H
 
 #include <gnutls_int.h>
 
-#define MAX(X,Y) ((X) > (Y) ? (X) : (Y));
-
 void _gnutls_str_cpy (char *dest, size_t dest_tot_size, const char *src);
 void _gnutls_mem_cpy (char *dest, size_t dest_tot_size, const char *src,
                       size_t src_size);
diff --git a/src/daemon/https/x509/Makefile.am b/src/daemon/https/x509/Makefile.am
index c3a30f03..6121dd51 100644
--- a/src/daemon/https/x509/Makefile.am
+++ b/src/daemon/https/x509/Makefile.am
@@ -1,5 +1,6 @@
 
-AM_CPPFLAGS = -I./includes \
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include \
 -I$(top_srcdir)/src/daemon/https/includes \
 -I$(top_srcdir)/src/daemon/https/minitasn1 \
 -I$(top_srcdir)/src/daemon/https/lgl \
diff --git a/src/daemon/https/x509/x509.h b/src/daemon/https/x509/x509.h
index c9bb22ef..8cef1d30 100644
--- a/src/daemon/https/x509/x509.h
+++ b/src/daemon/https/x509/x509.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef X509_H
-# define X509_H
+#define X509_H
 
 #define MIN(X,Y) ((X) > (Y) ? (Y) : (X));
 
@@ -781,8 +781,8 @@ typedef struct gnutls_x509_crt_int
 
 typedef struct gnutls_x509_privkey_int
   {
-    mpi_t params[MAX_PRIV_PARAMS_SIZE]; /* the size of params depends on the public 
-     * key algorithm 
+    mpi_t params[MAX_PRIV_PARAMS_SIZE]; /* the size of params depends on the public
+     * key algorithm
      */
     /*
      * RSA: [0] is modulus