8 files changed, 26 insertions, 36 deletions

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index b8f586b2..d17d6072 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -37,7 +37,13 @@ libmicrohttpd_la_LDFLAGS = \
 if ENABLE_HTTPS
 SUBDIRS += https .
 libmicrohttpd_la_SOURCES += connection_https.c
-libmicrohttpd_la_LIBADD += https/libhttps.la
+libmicrohttpd_la_LIBADD += \
+https/x509/libx509.la \
+https/lgl/liblgl.la \
+https/tls/libtls.la \
+https/minitasn1/libasn1.la \
+https/opencdk/libopencdk.la \
+https/openpgp/libopenpgp.la 
 endif
  
 check_PROGRAMS = \
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 31e4ce3b..399715db 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -161,8 +161,7 @@ _set_priority (priority_st * st, const int *list)
 
   return 0;
 }
-
-#endif
+#endif /* HTTPS_SUPPORT */
 
 /**
  * Obtain the select sets for this daemon.
@@ -1060,6 +1059,7 @@ void __attribute__ ((destructor)) MHD_pthread_handlers_ltdl_fini ()
 {
   sigaction (SIGALRM, &old, &sig);
 }
+
 #else
 void __attribute__ ((constructor)) MHD_win_ltdl_init ()
 {
diff --git a/src/daemon/https/Makefile.am b/src/daemon/https/Makefile.am
index 4725c405..9ebb2043 100644
--- a/src/daemon/https/Makefile.am
+++ b/src/daemon/https/Makefile.am
@@ -1,26 +1,9 @@
-SUBDIRS = minitasn1 opencdk openpgp lgl x509 tls . 
+# placing '.' at the end of SUBDIRS having OPENPGP enabled mixes up build order !
+SUBDIRS = minitasn1 lgl x509 tls 
 
-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/includes
-
-noinst_LTLIBRARIES = libhttps.la
-
-libhttps_la_SOURCES = \
-https_common.c
-
-libhttps_la_LIBADD = \
-opencdk/libopencdk.la \
-openpgp/libopenpgp.la \
-x509/libx509.la \
-lgl/liblgl.la \
-tls/libtls.la \
-minitasn1/libasn1.la
+if ENABLE_OPENPGP
+SUBDIRS += opencdk openpgp
+endif
    
 #noinst_PROGRAMS = errcodes
 #errcodes_SOURCES = errcodes.c
diff --git a/src/daemon/https/opencdk/Makefile.am b/src/daemon/https/opencdk/Makefile.am
index b6e67470..a9c96cfe 100644
--- a/src/daemon/https/opencdk/Makefile.am
+++ b/src/daemon/https/opencdk/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 
 noinst_LTLIBRARIES = libopencdk.la
 
-libopencdk_la_LDFLAGS = -lgcrypt
+libopencdk_la_LDFLAGS = -lgcrypt 
 
 libopencdk_la_SOURCES = armor.c filters.h main.c seskey.c types.h       \
         cipher.c kbnode.c main.h packet.h dummy.c sig-check.c verify.c  \
diff --git a/src/daemon/https/openpgp/gnutls_openpgp.h b/src/daemon/https/openpgp/gnutls_openpgp.h
index 82e22eee..130c0077 100644
--- a/src/daemon/https/openpgp/gnutls_openpgp.h
+++ b/src/daemon/https/openpgp/gnutls_openpgp.h
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#ifdef ENABLE_OPENPGP
+#if ENABLE_OPENPGP
 
 #ifndef GNUTLS_OPENPGP_H
 #define GNUTLS_OPENPGP_H
diff --git a/src/daemon/https/openpgp/openpgp.h b/src/daemon/https/openpgp/openpgp.h
index e4ea952b..d6ed9aae 100644
--- a/src/daemon/https/openpgp/openpgp.h
+++ b/src/daemon/https/openpgp/openpgp.h
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#ifdef ENABLE_OPENPGP
+#if ENABLE_OPENPGP
 
 #ifdef __cplusplus
 extern "C"
@@ -124,7 +124,7 @@ int gnutls_certificate_set_openpgp_key(gnutls_certificate_credentials_t
 
 #ifdef __cplusplus
 }
-#endif    
+#endif
 
 int _gnutls_map_cdk_rc(int rc);
 int gnutls_openpgp_crt_get_name(gnutls_openpgp_crt_t key,
diff --git a/src/daemon/https/tls/gnutls_priority.c b/src/daemon/https/tls/gnutls_priority.c
index 29132f8a..d4f1eb6f 100644
--- a/src/daemon/https/tls/gnutls_priority.c
+++ b/src/daemon/https/tls/gnutls_priority.c
@@ -199,9 +199,8 @@ int
 gnutls_certificate_type_set_priority (gnutls_session_t session,
                                       const int *list)
 {
-#ifdef ENABLE_OPENPGP
+#if ENABLE_OPENPGP
   return _set_priority (&session->internals.priorities.cert_type, list);
-
 #else
 
   return GNUTLS_E_UNIMPLEMENTED_FEATURE;
@@ -243,7 +242,7 @@ typedef void (rmadd_func) (priority_st * priority_list, int alg);
  * @priority: is a #gnutls_priority_t structure.
  *
  * Sets the priorities to use on the ciphers, key exchange methods,
- * macs and compression methods. 
+ * macs and compression methods.
  *
  * On success 0 is returned.
  *
@@ -288,7 +287,7 @@ gnutls_priority_set (gnutls_session_t session, gnutls_priority_t priority)
  * "NORMAL" option enables all "secure" ciphersuites. The 256-bit ciphers
  * are included as a fallback only. The ciphers are sorted by security margin.
  *
- * "SECURE128" flag enables all "secure" ciphersuites with ciphers up to 
+ * "SECURE128" flag enables all "secure" ciphersuites with ciphers up to
  * 128 bits, sorted by security margin.
  *
  * "SECURE256" flag enables all "secure" ciphersuites including the 256 bit
@@ -316,7 +315,7 @@ gnutls_priority_set (gnutls_session_t session, gnutls_priority_t priority)
  * are enabled (except for the RSA-EXPORT which is only enabled in
  * EXPORT level).
  *
- * Note that although one can select very long key sizes (such as 256 bits) 
+ * Note that although one can select very long key sizes (such as 256 bits)
  * for symmetric algorithms, to actually increase security the public key
  * algorithms have to use longer key sizes as well.
  *
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index 45f6ecc9..efec4b4e 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -35,19 +35,21 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include "gnutls.h"
+#include <pthread.h>
 
 #include "config.h"
 #include "plibc.h"
 #include "microhttpd.h"
 
+#include "gnutls.h"
+
 #ifndef MINGW
 #include <sys/mman.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #endif
 
-#include <pthread.h>
+
 
 #define MHD_MAX(a,b) ((a)<(b)) ? (b) : (a)
 #define MHD_MIN(a,b) ((a)<(b)) ? (a) : (b)