configure.ac: libgcrypt required for HTTPS support

some makefile issues
all cURL tests set to use SSLv3 [temporary]

10 files changed, 14 insertions, 20 deletions

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 3a3580a7..d850723b 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -3,6 +3,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/daemon \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/x509 \
+-I$(top_srcdir)/src/daemon/https/minitasn1 \
 -I$(top_srcdir)/src/daemon/https/openpgp \
 -I$(top_srcdir)/src/daemon/https/opencdk \
 -I$(top_srcdir)/src/daemon/https/tls \
diff --git a/src/daemon/connection_https.c b/src/daemon/connection_https.c
index 4f6af3e4..aed523ea 100644
--- a/src/daemon/connection_https.c
+++ b/src/daemon/connection_https.c
@@ -37,7 +37,7 @@
 #include "gnutls_int.h"
 #include "gnutls_record.h"
 
-/* TODO rm */
+/* TODO rm #include "gnutls_errors.h" */
 #include "gnutls_errors.h"
 
 /* forward declarations used when setting secure connection callbacks */
@@ -45,7 +45,6 @@ int MHD_connection_handle_read (struct MHD_Connection *connection);
 int MHD_connection_handle_write (struct MHD_Connection *connection);
 int MHD_connection_handle_idle (struct MHD_Connection *connection);
 
-/* TODO rm - appears in a switch default clause */
 static void
 MHD_tls_connection_close (struct MHD_Connection *connection)
 {
@@ -63,11 +62,10 @@ MHD_tls_connection_close (struct MHD_Connection *connection)
                                           MHD_REQUEST_TERMINATED_COMPLETED_OK);
 }
 
-/* TODO add error connection termination */
 static void
 MHD_tls_connection_close_err (struct MHD_Connection *connection)
 {
-  /* TODO impl */
+  /* TODO impl MHD_tls_connection_close_err */
 }
 
 union MHD_SessionInfo
diff --git a/src/daemon/https/tls/Makefile.am b/src/daemon/https/tls/Makefile.am
index 11e70592..40d49e08 100644
--- a/src/daemon/https/tls/Makefile.am
+++ b/src/daemon/https/tls/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/daemon/https \
 -I$(top_srcdir)/src/daemon/https/tls \
 -I$(top_srcdir)/src/daemon/https/lgl \
+-I$(top_srcdir)/src/daemon/https/minitasn1 \
 -I$(top_srcdir)/src/daemon/https/x509 \
 -I$(top_srcdir)/src/daemon/https/openpgp \
 -I$(top_srcdir)/src/daemon/https/opencdk \
diff --git a/src/daemon/https/x509/pkcs12.h b/src/daemon/https/x509/pkcs12.h
index 566058fb..41878ff2 100644
--- a/src/daemon/https/x509/pkcs12.h
+++ b/src/daemon/https/x509/pkcs12.h
@@ -22,10 +22,10 @@
  *
  */
 
-// TODO clean
+/* TODO clean */
 
 #ifndef GNUTLS_PKCS12_H
-# define GNUTLS_PKCS12_H
+#define GNUTLS_PKCS12_H
 
 #ifdef __cplusplus
 extern "C"
@@ -36,7 +36,7 @@ extern "C"
 
 #define MAX_BAG_ELEMENTS 32
 
-/* PKCS12 structures handling 
+/* PKCS12 structures handling
  */
 struct gnutls_pkcs12_int;
 
diff --git a/src/daemon/https/x509/x509.h b/src/daemon/https/x509/x509.h
index 8cef1d30..eaf2c31c 100644
--- a/src/daemon/https/x509/x509.h
+++ b/src/daemon/https/x509/x509.h
@@ -33,7 +33,6 @@ extern "C"
 #endif
 
 #include <gnutls.h>
-// TODO #include "libtasn1.h"
 #include "gnutls_mpi.h"
 
 /* Some OIDs usually found in Distinguished names, or
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index efec4b4e..4de5c6dd 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -530,7 +530,6 @@ struct MHD_Connection
   unsigned int current_chunk_offset;
 
   /* handlers used for processing read, write & idle connection operations */
-  /* TODO fix sig */
   int (*read_handler) (struct MHD_Connection * connection);
 
   int (*write_handler) (struct MHD_Connection * connection);
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 81b439fa..b4a4c99d 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -13,7 +13,7 @@ check_PROGRAMS = \
    mhds_get_test \
    tls_authentication_test \
    mhds_multi_daemon_test \
-   mhds_session_info_test
+   mhds_session_info_test   
    
 TESTS = $(check_PROGRAMS)
 
diff --git a/src/testcurl/https/mhds_get_test.c b/src/testcurl/https/mhds_get_test.c
index e92bf82c..f69ed7d0 100644
--- a/src/testcurl/https/mhds_get_test.c
+++ b/src/testcurl/https/mhds_get_test.c
@@ -90,7 +90,6 @@ http_ahc (void *cls, struct MHD_Connection *connection,
   FILE *file;
   struct stat buf;
 
-  // TODO never respond on first call
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
   if (&aptr != *ptr)
@@ -178,7 +177,7 @@ test_daemon_get (FILE * test_fd, char *cipher_suite, int proto_version)
 
   c = curl_easy_init ();
 #ifdef DEBUG
-  //curl_easy_setopt (c, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt (c, CURLOPT_VERBOSE, 1);
 #endif
   curl_easy_setopt (c, CURLOPT_URL, url);
   curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
@@ -263,7 +262,6 @@ test_file_certificates (FILE * test_fd, char *cipher_suite, int proto_version)
   sprintf (cert_path, "%s/%s", cur_dir, "cert.pem");
   sprintf (key_path, "%s/%s", cur_dir, "key.pem");
 
-
   if (NULL == (key_fd = fopen (key_path, "w+")))
     {
       fprintf (stderr, MHD_E_KEY_FILE_CREAT);
@@ -433,11 +431,11 @@ main (int argc, char *const *argv)
     }
 
   errorCount +=
-    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
+    test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
   errorCount +=
     test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
   errorCount +=
-    test_file_certificates (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
+    test_file_certificates (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
   /* TODO resolve cipher setting issue when compiling against GNU TLS */
   errorCount +=
     test_cipher_option (test_fd, "DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
@@ -445,10 +443,10 @@ main (int argc, char *const *argv)
     test_kx_option (test_fd, "EDH-RSA-DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
 
 
-  curl_global_cleanup ();
-  fclose (test_fd);
+   curl_global_cleanup ();
+   fclose (test_fd);
 
-  remove (test_file_name);
+   remove (test_file_name);
 
   return errorCount != 0;
 }
diff --git a/src/testcurl/https/mhds_multi_daemon_test.c b/src/testcurl/https/mhds_multi_daemon_test.c
index 5d490d41..25974f0a 100644
--- a/src/testcurl/https/mhds_multi_daemon_test.c
+++ b/src/testcurl/https/mhds_multi_daemon_test.c
@@ -87,7 +87,6 @@ http_ahc (void *cls, struct MHD_Connection *connection,
   FILE *file;
   struct stat buf;
 
-  /* TODO never respond on first call */
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
   if (&aptr != *ptr)
diff --git a/src/testcurl/https/tls_authentication_test.c b/src/testcurl/https/tls_authentication_test.c
index 5c790b26..bb741718 100644
--- a/src/testcurl/https/tls_authentication_test.c
+++ b/src/testcurl/https/tls_authentication_test.c
@@ -89,7 +89,6 @@ http_ahc (void *cls, struct MHD_Connection *connection,
   FILE *file;
   struct stat buf;
 
-  // TODO never respond on first call
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
   if (&aptr != *ptr)