1 files changed, 0 insertions, 247 deletions

diff --git a/src/daemon/https/tls/gnutls_x509.c b/src/daemon/https/tls/gnutls_x509.c
index 1e479fe5..0f8adfaa 100644
--- a/src/daemon/https/tls/gnutls_x509.c
+++ b/src/daemon/https/tls/gnutls_x509.c
@@ -546,69 +546,6 @@ MHD__gnutls_certificate_set_x509_key_mem (MHD_gtls_cert_credentials_t
   return 0;
 }
 
-static int
-generate_rdn_seq (MHD_gtls_cert_credentials_t res)
-{
-  MHD_gnutls_datum_t tmp;
-  int ret;
-  unsigned size, i;
-  opaque *pdata;
-
-  /* Generate the RDN sequence
-   * This will be sent to clients when a certificate
-   * request message is sent.
-   */
-
-  /* FIXME: in case of a client it is not needed
-   * to do that. This would save time and memory.
-   * However we don't have that information available
-   * here.
-   */
-
-  size = 0;
-  for (i = 0; i < res->x509_ncas; i++)
-    {
-      if ((ret =
-           MHD_gnutls_x509_crt_get_raw_dn (res->x509_ca_list[i], &tmp)) < 0)
-        {
-          MHD_gnutls_assert ();
-          return ret;
-        }
-      size += (2 + tmp.size);
-      MHD__gnutls_free_datum (&tmp);
-    }
-
-  if (res->x509_rdn_sequence.data != NULL)
-    MHD_gnutls_free (res->x509_rdn_sequence.data);
-
-  res->x509_rdn_sequence.data = MHD_gnutls_malloc (size);
-  if (res->x509_rdn_sequence.data == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_MEMORY_ERROR;
-    }
-  res->x509_rdn_sequence.size = size;
-
-  pdata = res->x509_rdn_sequence.data;
-
-  for (i = 0; i < res->x509_ncas; i++)
-    {
-      if ((ret =
-           MHD_gnutls_x509_crt_get_raw_dn (res->x509_ca_list[i], &tmp)) < 0)
-        {
-          MHD__gnutls_free_datum (&res->x509_rdn_sequence);
-          MHD_gnutls_assert ();
-          return ret;
-        }
-
-      MHD_gtls_write_datum16 (pdata, tmp);
-      pdata += (2 + tmp.size);
-      MHD__gnutls_free_datum (&tmp);
-    }
-
-  return 0;
-}
-
 /* Returns 0 if it's ok to use the enum MHD_GNUTLS_KeyExchangeAlgorithm with this
  * certificate (uses the KeyUsage field).
  */
@@ -668,187 +605,3 @@ MHD__gnutls_check_key_usage (const MHD_gnutls_cert * cert,
 
 
 
-static int
-parse_pem_ca_mem (MHD_gnutls_x509_crt_t ** cert_list, unsigned *ncerts,
-                  const opaque * input_cert, int input_cert_size)
-{
-  int i, size;
-  const opaque *ptr;
-  MHD_gnutls_datum_t tmp;
-  int ret, count;
-
-  /* move to the certificate
-   */
-  ptr = memmem (input_cert, input_cert_size,
-                PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
-  if (ptr == NULL)
-    ptr = memmem (input_cert, input_cert_size,
-                  PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
-
-  if (ptr == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_BASE64_DECODING_ERROR;
-    }
-  size = input_cert_size - (ptr - input_cert);
-
-  i = *ncerts + 1;
-  count = 0;
-
-  do
-    {
-
-      *cert_list =
-        (MHD_gnutls_x509_crt_t *) MHD_gtls_realloc_fast (*cert_list,
-                                                         i *
-                                                         sizeof
-                                                         (MHD_gnutls_x509_crt_t));
-
-      if (*cert_list == NULL)
-        {
-          MHD_gnutls_assert ();
-          return GNUTLS_E_MEMORY_ERROR;
-        }
-
-      ret = MHD_gnutls_x509_crt_init (&cert_list[0][i - 1]);
-      if (ret < 0)
-        {
-          MHD_gnutls_assert ();
-          return ret;
-        }
-
-      tmp.data = (opaque *) ptr;
-      tmp.size = size;
-
-      ret =
-        MHD_gnutls_x509_crt_import (cert_list[0][i - 1],
-                                    &tmp, GNUTLS_X509_FMT_PEM);
-      if (ret < 0)
-        {
-          MHD_gnutls_assert ();
-          return ret;
-        }
-
-      /* now we move ptr after the pem header
-       */
-      ptr++;
-      size--;
-      /* find the next certificate (if any)
-       */
-
-      if (size > 0)
-        {
-          char *ptr3;
-
-          ptr3 = memmem (ptr, size, PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
-          if (ptr3 == NULL)
-            ptr3 = memmem (ptr, size,
-                           PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
-
-          ptr = (const opaque *) ptr3;
-          size = input_cert_size - (ptr - input_cert);
-        }
-      else
-        ptr = NULL;
-
-      i++;
-      count++;
-
-    }
-  while (ptr != NULL);
-
-  *ncerts = i - 1;
-
-  return count;
-}
-
-/* Reads a DER encoded certificate list from memory and stores it to
- * a MHD_gnutls_cert structure.
- * returns the number of certificates parsed.
- */
-static int
-parse_der_ca_mem (MHD_gnutls_x509_crt_t ** cert_list, unsigned *ncerts,
-                  const void *input_cert, int input_cert_size)
-{
-  int i;
-  MHD_gnutls_datum_t tmp;
-  int ret;
-
-  i = *ncerts + 1;
-
-  *cert_list =
-    (MHD_gnutls_x509_crt_t *) MHD_gtls_realloc_fast (*cert_list,
-                                                     i *
-                                                     sizeof
-                                                     (MHD_gnutls_x509_crt_t));
-
-  if (*cert_list == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_MEMORY_ERROR;
-    }
-
-  tmp.data = (opaque *) input_cert;
-  tmp.size = input_cert_size;
-
-  ret = MHD_gnutls_x509_crt_init (&cert_list[0][i - 1]);
-  if (ret < 0)
-    {
-      MHD_gnutls_assert ();
-      return ret;
-    }
-
-  ret =
-    MHD_gnutls_x509_crt_import (cert_list[0][i - 1], &tmp,
-                                GNUTLS_X509_FMT_DER);
-  if (ret < 0)
-    {
-      MHD_gnutls_assert ();
-      return ret;
-    }
-
-  *ncerts = i;
-
-  return 1;                     /* one certificate parsed */
-}
-
-/**
-  * MHD__gnutls_certificate_set_x509_trust_mem - Used to add trusted CAs in a MHD_gtls_cert_credentials_t structure
-  * @res: is an #MHD_gtls_cert_credentials_t structure.
-  * @ca: is a list of trusted CAs or a DER certificate
-  * @type: is DER or PEM
-  *
-  * This function adds the trusted CAs in order to verify client or
-  * server certificates. In case of a client this is not required to
-  * be called if the certificates are not verified using
-  * MHD_gtls_certificate_verify_peers2().  This function may be called
-  * multiple times.
-  *
-  * In case of a server the CAs set here will be sent to the client if
-  * a certificate request is sent. This can be disabled using
-  * MHD__gnutls_certificate_send_x509_rdn_sequence().
-  *
-  * Returns: the number of certificates processed or a negative value
-  * on error.
-  **/
-int
-MHD__gnutls_certificate_set_x509_trust_mem (MHD_gtls_cert_credentials_t
-                                            res,
-                                            const MHD_gnutls_datum_t * ca,
-                                            MHD_gnutls_x509_crt_fmt_t type)
-{
-  int ret, ret2;
-
-  if (type == GNUTLS_X509_FMT_DER)
-    ret = parse_der_ca_mem (&res->x509_ca_list, &res->x509_ncas,
-                            ca->data, ca->size);
-  else
-    ret = parse_pem_ca_mem (&res->x509_ca_list, &res->x509_ncas,
-                            ca->data, ca->size);
-
-  if ((ret2 = generate_rdn_seq (res)) < 0)
-    return ret2;
-
-  return ret;
-}
-