9 files changed, 3 insertions, 748 deletions
diff --git a/src/daemon/https/includes/compat.h b/src/daemon/https/compat.h
index 32f5d2bd..32f5d2bd 100644
--- a/src/daemon/https/includes/compat.h
+++ b/src/daemon/https/compat.h
diff --git a/src/daemon/https/includes/extra.h b/src/daemon/https/extra.h
index 0c363259..0c363259 100644
--- a/src/daemon/https/includes/extra.h
+++ b/src/daemon/https/extra.h
diff --git a/src/daemon/https/includes/gnutls.h b/src/daemon/https/gnutls.h
index df34e72c..df34e72c 100644
--- a/src/daemon/https/includes/gnutls.h
+++ b/src/daemon/https/gnutls.h
diff --git a/src/daemon/https/https_common.c b/src/daemon/https/https_common.c
deleted file mode 100644
index de978219..00000000
--- a/src/daemon/https/https_common.c
+++ /dev/null
@@ -1,702 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GNUTLS.
- *
- * GNUTLS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNUTLS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls.h>
-#include <extra.h>
-#include <time.h>
-#include "https_common.h"
-#define TEST_STRING
-#define SU(x) (x!=NULL?x:"Unknown")
-// TODO clean - originaly from tls_test extern int verbose;
-int print_cert;
-int verbose = 0;
-static char buffer[5 * 1024];
-#define PRINTX(x,y) if (y[0]!=0) printf(" #   %s %s\n", x, y)
-#define PRINT_PGP_NAME(X) PRINTX( "NAME:", name)
-const char str_unknown[] = "(unknown)";
-/* Hex encodes the given data.
- */
-const char *
-raw_to_string (const unsigned char *raw, size_t raw_size)
-{
-  static char buf[1024];
-  size_t i;
-  if (raw_size == 0)
-    return NULL;
-  if (raw_size * 3 + 1 >= sizeof (buf))
-    return NULL;
-  for (i = 0; i < raw_size; i++)
-    {
-      sprintf (&(buf[i * 3]), "%02X%s", raw[i], (i == raw_size - 1) ? ""
-               : ":");
-    }
-  buf[sizeof (buf) - 1] = '\0';
-  return buf;
-}
-static const char *
-my_ctime (const time_t * tv)
-{
-  static char buf[256];
-  struct tm *tp;
-  if (((tp = localtime (tv)) == NULL) || (!strftime (buf, sizeof buf,
-                                                     "%a %b %e %H:%M:%S %Z %Y\n",
-                                                     tp)))
-    strcpy (buf, str_unknown);  /* make sure buf text isn't garbage */
-  return buf;
-}
-void
-print_x509_info (gnutls_session_t session, const char *hostname)
-{
-  gnutls_x509_crt_t crt;
-  const gnutls_datum_t *cert_list;
-  unsigned int cert_list_size = 0;
-  int ret;
-  char digest[20];
-  char serial[40];
-  char dn[256];
-  size_t dn_size;
-  size_t digest_size = sizeof (digest);
-  unsigned int j;
-  size_t serial_size = sizeof (serial);
-  const char *print;
-  const char *cstr;
-  unsigned int bits, algo;
-  time_t expiret, activet;
-  cert_list = gnutls_certificate_get_peers (session, &cert_list_size);
-  if (cert_list_size == 0)
-    {
-      fprintf (stderr, "No certificates found!\n");
-      return;
-    }
-  printf (" - Got a certificate list of %d certificates.\n\n",
-          cert_list_size);
-  for (j = 0; j < (unsigned int) cert_list_size; j++)
-    {
-      gnutls_x509_crt_init (&crt);
-      ret = gnutls_x509_crt_import (crt, &cert_list[j], GNUTLS_X509_FMT_DER);
-      if (ret < 0)
-        {
-          fprintf (stderr, "Decoding error: %s\n", gnutls_strerror (ret));
-          return;
-        }
-      printf (" - Certificate[%d] info:\n", j);
-      if (print_cert)
-        {
-          size_t size;
-          size = sizeof (buffer);
-          ret =
-            gnutls_x509_crt_export (crt, GNUTLS_X509_FMT_PEM, buffer, &size);
-          if (ret < 0)
-            {
-              fprintf (stderr, "Encoding error: %s\n", gnutls_strerror (ret));
-              return;
-            }
-          fputs ("\n", stdout);
-          fputs (buffer, stdout);
-          fputs ("\n", stdout);
-        }
-      if (j == 0 && hostname != NULL)
-        {                       /* Check the hostname of the first certificate
-                                 * if it matches the name of the host we
-                                 * connected to.
-                                 */
-          if (gnutls_x509_crt_check_hostname (crt, hostname) == 0)
-            {
-              printf
-                (" # The hostname in the certificate does NOT match '%s'.\n",
-                 hostname);
-            }
-          else
-            {
-              printf (" # The hostname in the certificate matches '%s'.\n",
-                      hostname);
-            }
-        }
-      expiret = gnutls_x509_crt_get_expiration_time (crt);
-      activet = gnutls_x509_crt_get_activation_time (crt);
-      printf (" # valid since: %s", my_ctime (&activet));
-      printf (" # expires at: %s", my_ctime (&expiret));
-      /* Print the serial number of the certificate.
-       */
-      if (verbose
-          && gnutls_x509_crt_get_serial (crt, serial, &serial_size) >= 0)
-        {
-          print = raw_to_string (serial, serial_size);
-          if (print != NULL)
-            printf (" # serial number: %s\n", print);
-        }
-      /* Print the fingerprint of the certificate
-       */
-      digest_size = sizeof (digest);
-      if ((ret = gnutls_x509_crt_get_fingerprint (crt, GNUTLS_DIG_MD5, digest,
-                                                  &digest_size)) < 0)
-        {
-          fprintf (stderr,
-                   "Error in fingerprint calculation: %s\n",
-                   gnutls_strerror (ret));
-        }
-      else
-        {
-          print = raw_to_string (digest, digest_size);
-          if (print != NULL)
-            printf (" # fingerprint: %s\n", print);
-        }
-      /* Print the version of the X.509
-       * certificate.
-       */
-      if (verbose)
-        {
-          printf (" # version: #%d\n", gnutls_x509_crt_get_version (crt));
-          bits = 0;
-          algo = gnutls_x509_crt_get_pk_algorithm (crt, &bits);
-          printf (" # public key algorithm: ");
-          cstr = SU (gnutls_pk_algorithm_get_name (algo));
-          printf ("%s (%d bits)\n", cstr, bits);
-#ifdef ENABLE_PKI
-          if (algo == GNUTLS_PK_RSA)
-            {
-              gnutls_datum_t e, m;
-              ret = gnutls_x509_crt_get_pk_rsa_raw (crt, &m, &e);
-              if (ret >= 0)
-                {
-                  print = SU (raw_to_string (e.data, e.size));
-                  printf (" # e [%d bits]: %s\n", e.size * 8, print);
-                  print = SU (raw_to_string (m.data, m.size));
-                  printf (" # m [%d bits]: %s\n", m.size * 8, print);
-                  gnutls_free (e.data);
-                  gnutls_free (m.data);
-                }
-            }
-#endif
-        }
-      dn_size = sizeof (dn);
-      ret = gnutls_x509_crt_get_dn (crt, dn, &dn_size);
-      if (ret >= 0)
-        printf (" # Subject's DN: %s\n", dn);
-      dn_size = sizeof (dn);
-      ret = gnutls_x509_crt_get_issuer_dn (crt, dn, &dn_size);
-      if (ret >= 0)
-        printf (" # Issuer's DN: %s\n", dn);
-      gnutls_x509_crt_deinit (crt);
-      printf ("\n");
-    }
-}
-#if ENABLE_OPENPGP
-void
-print_openpgp_info (gnutls_session_t session, const char *hostname)
-{
-  char digest[20];
-  size_t digest_size = sizeof (digest);
-  int ret;
-  const char *print;
-  const char *cstr;
-  char name[256];
-  size_t name_len = sizeof (name);
-  gnutls_openpgp_crt_t crt;
-  const gnutls_datum_t *cert_list;
-  int cert_list_size = 0;
-  time_t expiret;
-  time_t activet;
-  cert_list = gnutls_certificate_get_peers (session, &cert_list_size);
-  if (cert_list_size > 0)
-    {
-      unsigned int algo, bits;
-      gnutls_openpgp_crt_init (&crt);
-      ret = gnutls_openpgp_crt_import (crt, &cert_list[0],
-                                       GNUTLS_OPENPGP_FMT_RAW);
-      if (ret < 0)
-        {
-          fprintf (stderr, "Decoding error: %s\n", gnutls_strerror (ret));
-          return;
-        }
-      if (print_cert)
-        {
-          size_t size;
-          size = sizeof (buffer);
-          ret = gnutls_openpgp_crt_export (crt, GNUTLS_OPENPGP_FMT_BASE64,
-                                           buffer, &size);
-          if (ret < 0)
-            {
-              fprintf (stderr, "Encoding error: %s\n", gnutls_strerror (ret));
-              return;
-            }
-          fputs ("\n", stdout);
-          fputs (buffer, stdout);
-          fputs ("\n", stdout);
-        }
-      if (hostname != NULL)
-        {                       /* Check the hostname of the first certificate
-                                 * if it matches the name of the host we
-                                 * connected to.
-                                 */
-          if (gnutls_openpgp_crt_check_hostname (crt, hostname) == 0)
-            {
-              printf (" # The hostname in the key does NOT match '%s'.\n",
-                      hostname);
-            }
-          else
-            {
-              printf (" # The hostname in the key matches '%s'.\n", hostname);
-            }
-        }
-      activet = gnutls_openpgp_crt_get_creation_time (crt);
-      expiret = gnutls_openpgp_crt_get_expiration_time (crt);
-      printf (" # Key was created at: %s", my_ctime (&activet));
-      printf (" # Key expires: ");
-      if (expiret != 0)
-        printf ("%s", my_ctime (&expiret));
-      else
-        printf ("Never\n");
-      if (gnutls_openpgp_crt_get_fingerprint (crt, digest, &digest_size) >= 0)
-        {
-          print = raw_to_string (digest, digest_size);
-          printf (" # PGP Key version: %d\n",
-                  gnutls_openpgp_crt_get_version (crt));
-          bits = 0;
-          algo = gnutls_openpgp_crt_get_pk_algorithm (crt, &bits);
-          printf (" # PGP Key public key algorithm: ");
-          cstr = SU (gnutls_pk_algorithm_get_name (algo));
-          printf ("%s (%d bits)\n", cstr, bits);
-          if (print != NULL)
-            printf (" # PGP Key fingerprint: %s\n", print);
-          name_len = sizeof (name);
-          if (gnutls_openpgp_crt_get_name (crt, 0, name, &name_len) < 0)
-            {
-              fprintf (stderr, "Could not extract name\n");
-            }
-          else
-            {
-              PRINT_PGP_NAME (name);
-            }
-        }
-      gnutls_openpgp_crt_deinit (crt);
-    }
-}
-#endif
-void
-print_cert_vrfy (gnutls_session_t session)
-{
-  int rc;
-  unsigned int status;
-  rc = gnutls_certificate_verify_peers2 (session, &status);
-  printf ("\n");
-  if (rc == GNUTLS_E_NO_CERTIFICATE_FOUND)
-    {
-      printf ("- Peer did not send any certificate.\n");
-      return;
-    }
-  if (rc < 0)
-    {
-      printf ("- Could not verify certificate (err: %s)\n",
-              gnutls_strerror (rc));
-      return;
-    }
-  if (gnutls_certificate_type_get (session) == GNUTLS_CRT_X509)
-    {
-      if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
-        printf ("- Peer's certificate issuer is unknown\n");
-      if (status & GNUTLS_CERT_INVALID)
-        printf ("- Peer's certificate is NOT trusted\n");
-      else
-        printf ("- Peer's certificate is trusted\n");
-    }
-  else
-    {
-      if (status & GNUTLS_CERT_INVALID)
-        printf ("- Peer's key is invalid\n");
-      else
-        printf ("- Peer's key is valid\n");
-      if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
-        printf ("- Could not find a signer of the peer's key\n");
-    }
-}
-int
-print_info (gnutls_session_t session, const char *hostname)
-{
-  const char *tmp;
-  gnutls_credentials_type_t cred;
-  gnutls_kx_algorithm_t kx;
-  /* print the key exchange's algorithm name
-   */
-  kx = gnutls_kx_get (session);
-  cred = gnutls_auth_get_type (session);
-  switch (cred)
-    {
-#ifdef ENABLE_ANON
-    case GNUTLS_CRD_ANON:
-      printf ("- Anonymous DH using prime of %d bits, secret key "
-              "of %d bits, and peer's public key is %d bits.\n",
-              gnutls_dh_get_prime_bits (session),
-              gnutls_dh_get_secret_bits (session),
-              gnutls_dh_get_peers_public_bits (session));
-      break;
-#endif
-#ifdef ENABLE_SRP
-    case GNUTLS_CRD_SRP:
-      /* This should be only called in server
-       * side.
-       */
-      if (gnutls_srp_server_get_username (session) != NULL)
-        printf ("- SRP authentication. Connected as '%s'\n",
-                gnutls_srp_server_get_username (session));
-      break;
-#endif
-#ifdef ENABLE_PSK
-    case GNUTLS_CRD_PSK:
-      /* This should be only called in server
-       * side.
-       */
-      if (gnutls_psk_server_get_username (session) != NULL)
-        printf ("- PSK authentication. Connected as '%s'\n",
-                gnutls_psk_server_get_username (session));
-      if (kx == GNUTLS_KX_DHE_PSK)
-        {
-          printf ("- DH using prime of %d bits, secret key "
-                  "of %d bits, and peer's public key is %d bits.\n",
-                  gnutls_dh_get_prime_bits (session),
-                  gnutls_dh_get_secret_bits (session),
-                  gnutls_dh_get_peers_public_bits (session));
-        }
-      break;
-#endif
-    case GNUTLS_CRD_IA:
-      printf ("- TLS/IA authentication\n");
-      break;
-    case GNUTLS_CRD_CERTIFICATE:
-      {
-        char dns[256];
-        size_t dns_size = sizeof (dns);
-        unsigned int type;
-        /* This fails in client side */
-        if (gnutls_server_name_get (session, dns, &dns_size, &type, 0) == 0)
-          {
-            printf ("- Given server name[%d]: %s\n", type, dns);
-          }
-      }
-      if (kx == GNUTLS_KX_DHE_RSA || kx == GNUTLS_KX_DHE_DSS)
-        {
-          printf ("- Ephemeral DH using prime of %d bits, secret key "
-                  "of %d bits, and peer's public key is %d bits.\n",
-                  gnutls_dh_get_prime_bits (session),
-                  gnutls_dh_get_secret_bits (session),
-                  gnutls_dh_get_peers_public_bits (session));
-        }
-      print_cert_info (session, hostname);
-      print_cert_vrfy (session);
-    }
-  tmp = SU (gnutls_protocol_get_name (gnutls_protocol_get_version (session)));
-  printf ("- Version: %s\n", tmp);
-  tmp = SU (gnutls_kx_get_name (kx));
-  printf ("- Key Exchange: %s\n", tmp);
-  tmp = SU (gnutls_cipher_get_name (gnutls_cipher_get (session)));
-  printf ("- Cipher: %s\n", tmp);
-  tmp = SU (gnutls_mac_get_name (gnutls_mac_get (session)));
-  printf ("- MAC: %s\n", tmp);
-  tmp = SU (gnutls_compression_get_name (gnutls_compression_get (session)));
-  printf ("- Compression: %s\n", tmp);
-  if (verbose)
-    {
-      char id[32];
-      size_t id_size = sizeof (id);
-      gnutls_session_get_id (session, id, &id_size);
-      printf ("- Session ID: %s\n", raw_to_string (id, id_size));
-    }
-  fflush (stdout);
-  return 0;
-}
-void
-print_cert_info (gnutls_session_t session, const char *hostname)
-{
-  if (gnutls_certificate_client_get_request_status (session) != 0)
-    printf ("- Server has requested a certificate.\n");
-  printf ("- Certificate type: ");
-  switch (gnutls_certificate_type_get (session))
-    {
-    case GNUTLS_CRT_X509:
-      printf ("X.509\n");
-      print_x509_info (session, hostname);
-      break;
-#if ENABLE_OPENPGP
-    case GNUTLS_CRT_OPENPGP:
-      printf ("OpenPGP\n");
-      print_openpgp_info (session, hostname);
-      break;
-#endif
-    }
-}
-void
-print_list (int verbose)
-{
-  {
-    size_t i;
-    const char *name;
-    char id[2];
-    gnutls_kx_algorithm_t kx;
-    gnutls_cipher_algorithm_t cipher;
-    gnutls_mac_algorithm_t mac;
-    gnutls_protocol_t version;
-    printf ("Cipher suites:\n");
-    for (i = 0; (name = gnutls_cipher_suite_info (i, id, &kx, &cipher, &mac,
-                                                  &version)); i++)
-      {
-        printf ("%-50s\t0x%02x, 0x%02x\t%s\n", name, (unsigned char) id[0],
-                (unsigned char) id[1], gnutls_protocol_get_name (version));
-        if (verbose)
-          printf ("\tKey exchange: %s\n\tCipher: %s\n\tMAC: %s\n\n",
-                  gnutls_kx_get_name (kx), gnutls_cipher_get_name (cipher),
-                  gnutls_mac_get_name (mac));
-      }
-  }
-  {
-    const gnutls_certificate_type_t *p = gnutls_certificate_type_list ();
-    printf ("Certificate types: ");
-    for (; *p; p++)
-      {
-        printf ("%s", gnutls_certificate_type_get_name (*p));
-        if (*(p + 1))
-          printf (", ");
-        else
-          printf ("\n");
-      }
-  }
-  {
-    const gnutls_protocol_t *p = gnutls_protocol_list ();
-    printf ("Protocols: ");
-    for (; *p; p++)
-      {
-        printf ("%s", gnutls_protocol_get_name (*p));
-        if (*(p + 1))
-          printf (", ");
-        else
-          printf ("\n");
-      }
-  }
-  {
-    const gnutls_cipher_algorithm_t *p = gnutls_cipher_list ();
-    printf ("Ciphers: ");
-    for (; *p; p++)
-      {
-        printf ("%s", gnutls_cipher_get_name (*p));
-        if (*(p + 1))
-          printf (", ");
-        else
-          printf ("\n");
-      }
-  }
-  {
-    const gnutls_mac_algorithm_t *p = gnutls_mac_list ();
-    printf ("MACs: ");
-    for (; *p; p++)
-      {
-        printf ("%s", gnutls_mac_get_name (*p));
-        if (*(p + 1))
-          printf (", ");
-        else
-          printf ("\n");
-      }
-  }
-  {
-    const gnutls_kx_algorithm_t *p = gnutls_kx_list ();
-    printf ("Key exchange algorithms: ");
-    for (; *p; p++)
-      {
-        printf ("%s", gnutls_kx_get_name (*p));
-        if (*(p + 1))
-          printf (", ");
-        else
-          printf ("\n");
-      }
-  }
-  {
-    const gnutls_compression_method_t *p = gnutls_compression_list ();
-    printf ("Compression: ");
-    for (; *p; p++)
-      {
-        printf ("%s", gnutls_compression_get_name (*p));
-        if (*(p + 1))
-          printf (", ");
-        else
-          printf ("\n");
-      }
-  }
-}
-void
-print_license (void)
-{
-  fputs ("\nCopyright (C) 2004,2005,2006,2007 Free Software Foundation\n"
-         "This program is free software; you can redistribute it and/or modify \n"
-         "it under the terms of the GNU General Public License as published by \n"
-         "the Free Software Foundation; either version 3 of the License, or \n"
-         "(at your option) any later version. \n" "\n"
-         "This program is distributed in the hope that it will be useful, \n"
-         "but WITHOUT ANY WARRANTY; without even the implied warranty of \n"
-         "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the \n"
-         "GNU General Public License for more details. \n" "\n"
-         "You should have received a copy of the GNU General Public License \n"
-         "along with this program; if not, write to the Free Software \n"
-         "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\n",
-         stdout);
-}
-void
-sockets_init (void)
-{
-#ifdef _WIN32
-  WORD wVersionRequested;
-  WSADATA wsaData;
-  wVersionRequested = MAKEWORD (1, 1);
-  if (WSAStartup (wVersionRequested, &wsaData) != 0)
-    {
-      perror ("WSA_STARTUP_ERROR");
-    }
-#endif
-}
-/* converts a service name or a port (in string) to a
- * port number. The protocol is assumed to be TCP.
- *
- * returns -1 on error;
- */
-int
-service_to_port (const char *service)
-{
-  int port;
-  struct servent *server_port;
-  port = atoi (service);
-  if (port != 0)
-    return port;
-  server_port = getservbyname (service, "tcp");
-  if (server_port == NULL)
-    {
-      perror ("getservbyname()");
-      return (-1);
-    }
-  return ntohs (server_port->s_port);
-}
diff --git a/src/daemon/https/https_common.h b/src/daemon/https/https_common.h
deleted file mode 100644
index 3ccd2cb1..00000000
--- a/src/daemon/https/https_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#define PORT 5556
-#define SERVER "127.0.0.1"
-#include <config.h>
-#include <gnutls.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#ifdef _WIN32
-# include <io.h>
-# include <winbase.h>
-# define close closesocket
-#else
-# include <netinet/in.h>
-# include <unistd.h>
-# include <netdb.h>
-# include <signal.h>
-#endif
-/* the number of elements in the priority structures.
- */
-#define PRI_MAX 16
-extern const char str_unknown[];
-int print_info (gnutls_session_t state, const char *hostname);
-void print_cert_info (gnutls_session_t state, const char *hostname);
-void print_list (int verbose);
-void parse_comp (char **comp, int ncomp, int *comp_priority);
-void parse_kx (char **kx, int nkx, int *kx_priority);
-void parse_ctypes (char **ctype, int nctype, int *cert_type_priority);
-void parse_macs (char **macs, int nmacs, int *mac_priority);
-void parse_ciphers (char **ciphers, int nciphers, int *cipher_priority);
-void parse_protocols (char **protocols, int protocols_size,
-                      int *protocol_priority);
-const char *raw_to_string (const unsigned char *raw, size_t raw_size);
-int service_to_port (const char *service);
-void sockets_init (void);
diff --git a/src/daemon/https/includes/Makefile.am b/src/daemon/https/includes/Makefile.am
deleted file mode 100644
index b0c6ada1..00000000
--- a/src/daemon/https/includes/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/https/includes
-lib_LTLIBRARIES = libmicrohttpd.la
diff --git a/src/daemon/https/openpgp/Makefile.am b/src/daemon/https/openpgp/Makefile.am
index 66380444..50f03c24 100644
--- a/src/daemon/https/openpgp/Makefile.am
+++ b/src/daemon/https/openpgp/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = .
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/daemon/https/includes \
+-I$(top_srcdir)/src/daemon/https \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/x509 \
 -I$(top_srcdir)/src/daemon/https/tls \
diff --git a/src/daemon/https/tls/Makefile.am b/src/daemon/https/tls/Makefile.am
index 63cbaabe..11e70592 100644
--- a/src/daemon/https/tls/Makefile.am
+++ b/src/daemon/https/tls/Makefile.am
@@ -3,12 +3,12 @@ SUBDIRS = .
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
 -I$(top_srcdir)/src/daemon/ \
+-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/x509 \
 -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/x509/Makefile.am b/src/daemon/https/x509/Makefile.am
index 6121dd51..2bdb5799 100644
--- a/src/daemon/https/x509/Makefile.am
+++ b/src/daemon/https/x509/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/daemon/https/includes \
+-I$(top_srcdir)/src/daemon/https \
 -I$(top_srcdir)/src/daemon/https/minitasn1 \
 -I$(top_srcdir)/src/daemon/https/lgl \
 -I$(top_srcdir)/src/daemon/https/x509 \