1 files changed, 0 insertions, 622 deletions

diff --git a/src/daemon/https/x509/x509.c b/src/daemon/https/x509/x509.c
index 8e3135c8..9ce1e76d 100644
--- a/src/daemon/https/x509/x509.c
+++ b/src/daemon/https/x509/x509.c
@@ -32,7 +32,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509.h>
-#include <dn.h>
 #include <extensions.h>
 #include <libtasn1.h>
 #include <mpi.h>
@@ -178,148 +177,6 @@ cleanup:MHD_gnutls_free (signature);
 }
 
 /**
- * MHD_gnutls_x509_crt_get_dn_by_oid - This function returns the Certificate's distinguished name
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @oid: holds an Object Identified in null terminated string
- * @indx: In case multiple same OIDs exist in the RDN, this specifies which to send. Use zero to get the first one.
- * @raw_flag: If non zero returns the raw DER data of the DN part.
- * @buf: a pointer where the DN part will be copied (may be null).
- * @sizeof_buf: initially holds the size of @buf
- *
- * This function will extract the part of the name of the Certificate
- * subject specified by the given OID. The output, if the raw flag is not
- * used, will be encoded as described in RFC2253. Thus a string that is
- * ASCII or UTF-8 encoded, depending on the certificate data.
- *
- * Some helper macros with popular OIDs can be found in gnutls/x509.h
- * If raw flag is zero, this function will only return known OIDs as
- * text. Other OIDs will be DER encoded, as described in RFC2253 --
- * in hex format with a '\#' prefix.  You can check about known OIDs
- * using MHD_gnutls_x509_dn_oid_known().
- *
- * If @buf is null then only the size will be filled.
- *
- * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not
- * long enough, and in that case the *sizeof_buf will be updated with
- * the required size.  On success 0 is returned.
- *
- **/
-int
-MHD_gnutls_x509_crt_get_dn_by_oid (MHD_gnutls_x509_crt_t cert,
-                                   const char *oid,
-                                   int indx,
-                                   unsigned int raw_flag,
-                                   void *buf, size_t * sizeof_buf)
-{
-  if (cert == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_INVALID_REQUEST;
-    }
-
-  return MHD__gnutls_x509_parse_dn_oid (cert->cert,
-                                        "tbsCertificate.subject.rdnSequence",
-                                        oid, indx, raw_flag, buf, sizeof_buf);
-}
-
-/**
- * MHD_gnutls_x509_crt_get_signature_algorithm - This function returns the Certificate's signature algorithm
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- *
- * This function will return a value of the MHD_gnutls_sign_algorithm_t enumeration that
- * is the signature algorithm.
- *
- * Returns a negative value on error.
- *
- **/
-int
-MHD_gnutls_x509_crt_get_signature_algorithm (MHD_gnutls_x509_crt_t cert)
-{
-  int result;
-  MHD_gnutls_datum_t sa;
-
-  if (cert == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_INVALID_REQUEST;
-    }
-
-  /* Read the signature algorithm. Note that parameters are not
-   * read. They will be read from the issuer's certificate if needed.
-   */
-  result =
-    MHD__gnutls_x509_read_value (cert->cert, "signatureAlgorithm.algorithm",
-                                 &sa, 0);
-
-  if (result < 0)
-    {
-      MHD_gnutls_assert ();
-      return result;
-    }
-
-  result = MHD_gtls_x509_oid2sign_algorithm ((const char *) sa.data);
-
-  MHD__gnutls_free_datum (&sa);
-
-  return result;
-}
-
-/**
- * MHD_gnutls_x509_crt_get_signature - Returns the Certificate's signature
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @sig: a pointer where the signature part will be copied (may be null).
- * @sizeof_sig: initially holds the size of @sig
- *
- * This function will extract the signature field of a certificate.
- *
- * Returns 0 on success, and a negative value on error.
- **/
-int
-MHD_gnutls_x509_crt_get_signature (MHD_gnutls_x509_crt_t cert,
-                                   char *sig, size_t * sizeof_sig)
-{
-  int result;
-  int bits, len;
-
-  if (cert == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_INVALID_REQUEST;
-    }
-
-  bits = 0;
-  result = MHD__asn1_read_value (cert->cert, "signature", NULL, &bits);
-  if (result != ASN1_MEM_ERROR)
-    {
-      MHD_gnutls_assert ();
-      return MHD_gtls_asn2err (result);
-    }
-
-  if (bits % 8 != 0)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_CERTIFICATE_ERROR;
-    }
-
-  len = bits / 8;
-
-  if (*sizeof_sig < len)
-    {
-      *sizeof_sig = bits / 8;
-      return GNUTLS_E_SHORT_MEMORY_BUFFER;
-    }
-
-  result = MHD__asn1_read_value (cert->cert, "signature", sig, &len);
-  if (result != ASN1_SUCCESS)
-    {
-      MHD_gnutls_assert ();
-      return MHD_gtls_asn2err (result);
-    }
-
-  return 0;
-}
-
-/**
  * MHD_gnutls_x509_crt_get_version - This function returns the Certificate's version number
  * @cert: should contain a MHD_gnutls_x509_crt_t structure
  *
@@ -400,50 +257,6 @@ MHD_gnutls_x509_crt_get_expiration_time (MHD_gnutls_x509_crt_t cert)
 }
 
 /**
- * MHD_gnutls_x509_crt_get_serial - This function returns the certificate's serial number
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @result: The place where the serial number will be copied
- * @result_size: Holds the size of the result field.
- *
- * This function will return the X.509 certificate's serial number.
- * This is obtained by the X509 Certificate serialNumber
- * field. Serial is not always a 32 or 64bit number. Some CAs use
- * large serial numbers, thus it may be wise to handle it as something
- * opaque.
- *
- * Returns 0 on success and a negative value in case of an error.
- *
- **/
-int
-MHD_gnutls_x509_crt_get_serial (MHD_gnutls_x509_crt_t cert,
-                                void *result, size_t * result_size)
-{
-  int ret, len;
-
-  if (cert == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_INVALID_REQUEST;
-    }
-
-  len = *result_size;
-  ret
-    =
-    MHD__asn1_read_value (cert->cert, "tbsCertificate.serialNumber", result,
-                          &len);
-  *result_size = len;
-
-  if (ret != ASN1_SUCCESS)
-    {
-      MHD_gnutls_assert ();
-      return MHD_gtls_asn2err (ret);
-    }
-
-  return 0;
-}
-
-
-/**
  * MHD_gnutls_x509_crt_get_pk_algorithm - This function returns the certificate's PublicKey algorithm
  * @cert: should contain a MHD_gnutls_x509_crt_t structure
  * @bits: if bits is non null it will hold the size of the parameters' in bits
@@ -496,396 +309,6 @@ is_type_printable (int type)
     return 0;
 }
 
-#define XMPP_OID "1.3.6.1.5.5.7.8.5"
-
-/* returns the type and the name on success.
- * Type is also returned as a parameter in case of an error.
- */
-static int
-parse_general_name (ASN1_TYPE src,
-                    const char *src_name,
-                    int seq,
-                    void *name,
-                    size_t * name_size,
-                    unsigned int *ret_type, int othername_oid)
-{
-  int len;
-  char nptr[MAX_NAME_SIZE];
-  int result;
-  opaque choice_type[128];
-  MHD_gnutls_x509_subject_alt_name_t type;
-
-  seq++;                        /* 0->1, 1->2 etc */
-
-  if (src_name[0] != 0)
-    snprintf (nptr, sizeof (nptr), "%s.?%u", src_name, seq);
-  else
-    snprintf (nptr, sizeof (nptr), "?%u", seq);
-
-  len = sizeof (choice_type);
-  result = MHD__asn1_read_value (src, nptr, choice_type, &len);
-
-  if (result == ASN1_VALUE_NOT_FOUND || result == ASN1_ELEMENT_NOT_FOUND)
-    {
-      return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
-    }
-
-  if (result != ASN1_SUCCESS)
-    {
-      MHD_gnutls_assert ();
-      return MHD_gtls_asn2err (result);
-    }
-
-  type = MHD__gnutls_x509_san_find_type ((char *) choice_type);
-  if (type == (MHD_gnutls_x509_subject_alt_name_t) - 1)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_X509_UNKNOWN_SAN;
-    }
-
-  if (ret_type)
-    *ret_type = type;
-
-  if (type == GNUTLS_SAN_OTHERNAME)
-    {
-      if (othername_oid)
-        MHD_gtls_str_cat (nptr, sizeof (nptr), ".otherName.type-id");
-      else
-        MHD_gtls_str_cat (nptr, sizeof (nptr), ".otherName.value");
-
-      len = *name_size;
-      result = MHD__asn1_read_value (src, nptr, name, &len);
-      *name_size = len;
-
-      if (result == ASN1_MEM_ERROR)
-        return GNUTLS_E_SHORT_MEMORY_BUFFER;
-
-      if (result != ASN1_SUCCESS)
-        {
-          MHD_gnutls_assert ();
-          return MHD_gtls_asn2err (result);
-        }
-
-      if (othername_oid)
-        {
-          if (len > strlen (XMPP_OID) && strcmp (name, XMPP_OID) == 0)
-            type = GNUTLS_SAN_OTHERNAME_XMPP;
-        }
-      else
-        {
-          char oid[42];
-
-          if (src_name[0] != 0)
-            snprintf (nptr, sizeof (nptr), "%s.?%u.otherName.type-id",
-                      src_name, seq);
-          else
-            snprintf (nptr, sizeof (nptr), "?%u.otherName.type-id", seq);
-
-          len = sizeof (oid);
-          result = MHD__asn1_read_value (src, nptr, oid, &len);
-          if (result != ASN1_SUCCESS)
-            {
-              MHD_gnutls_assert ();
-              return MHD_gtls_asn2err (result);
-            }
-
-          if (len > strlen (XMPP_OID) && strcmp (oid, XMPP_OID) == 0)
-            {
-              ASN1_TYPE c2 = ASN1_TYPE_EMPTY;
-
-              result =
-                MHD__asn1_create_element (MHD__gnutls_get_pkix (),
-                                          "PKIX1.XmppAddr", &c2);
-              if (result != ASN1_SUCCESS)
-                {
-                  MHD_gnutls_assert ();
-                  return MHD_gtls_asn2err (result);
-                }
-
-              result = MHD__asn1_der_decoding (&c2, name, *name_size, NULL);
-              if (result != ASN1_SUCCESS)
-                {
-                  MHD_gnutls_assert ();
-                  MHD__asn1_delete_structure (&c2);
-                  return MHD_gtls_asn2err (result);
-                }
-
-              result = MHD__asn1_read_value (c2, "", name, &len);
-              *name_size = len;
-              if (result != ASN1_SUCCESS)
-                {
-                  MHD_gnutls_assert ();
-                  MHD__asn1_delete_structure (&c2);
-                  return MHD_gtls_asn2err (result);
-                }
-              MHD__asn1_delete_structure (&c2);
-            }
-        }
-    }
-  else if (type == GNUTLS_SAN_DN)
-    {
-      MHD_gtls_str_cat (nptr, sizeof (nptr), ".directoryName");
-      result = MHD__gnutls_x509_parse_dn (src, nptr, name, name_size);
-      if (result < 0)
-        {
-          MHD_gnutls_assert ();
-          return result;
-        }
-    }
-  else if (othername_oid)
-    return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
-  else
-    {
-      size_t orig_name_size = *name_size;
-
-      MHD_gtls_str_cat (nptr, sizeof (nptr), ".");
-      MHD_gtls_str_cat (nptr, sizeof (nptr), (const char *) choice_type);
-
-      len = *name_size;
-      result = MHD__asn1_read_value (src, nptr, name, &len);
-      *name_size = len;
-
-      if (result == ASN1_MEM_ERROR)
-        {
-          if (is_type_printable (type))
-            (*name_size)++;
-          return GNUTLS_E_SHORT_MEMORY_BUFFER;
-        }
-
-      if (result != ASN1_SUCCESS)
-        {
-          MHD_gnutls_assert ();
-          return MHD_gtls_asn2err (result);
-        }
-
-      if (is_type_printable (type))
-        {
-
-          if (len + 1 > orig_name_size)
-            {
-              MHD_gnutls_assert ();
-              (*name_size)++;
-              return GNUTLS_E_SHORT_MEMORY_BUFFER;
-            }
-
-          /* null terminate it */
-          ((char *) name)[*name_size] = 0;
-        }
-
-    }
-
-  return type;
-}
-
-static int
-get_subject_alt_name (MHD_gnutls_x509_crt_t cert,
-                      unsigned int seq,
-                      void *ret,
-                      size_t * ret_size,
-                      unsigned int *ret_type,
-                      unsigned int *critical, int othername_oid)
-{
-  int result;
-  MHD_gnutls_datum_t dnsname;
-  ASN1_TYPE c2 = ASN1_TYPE_EMPTY;
-  MHD_gnutls_x509_subject_alt_name_t type;
-
-  if (cert == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_INVALID_REQUEST;
-    }
-
-  if (ret)
-    memset (ret, 0, *ret_size);
-  else
-    *ret_size = 0;
-
-  if ((result =
-       MHD__gnutls_x509_crt_get_extension (cert, "2.5.29.17", 0, &dnsname,
-                                           critical)) < 0)
-    {
-      return result;
-    }
-
-  if (dnsname.size == 0 || dnsname.data == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
-    }
-
-  result =
-    MHD__asn1_create_element (MHD__gnutls_get_pkix (), "PKIX1.SubjectAltName",
-                              &c2);
-  if (result != ASN1_SUCCESS)
-    {
-      MHD_gnutls_assert ();
-      MHD__gnutls_free_datum (&dnsname);
-      return MHD_gtls_asn2err (result);
-    }
-
-  result = MHD__asn1_der_decoding (&c2, dnsname.data, dnsname.size, NULL);
-  MHD__gnutls_free_datum (&dnsname);
-
-  if (result != ASN1_SUCCESS)
-    {
-      MHD_gnutls_assert ();
-      MHD__asn1_delete_structure (&c2);
-      return MHD_gtls_asn2err (result);
-    }
-
-  result = parse_general_name (c2, "", seq, ret, ret_size, ret_type,
-                               othername_oid);
-
-  MHD__asn1_delete_structure (&c2);
-
-  if (result < 0)
-    {
-      return result;
-    }
-
-  type = result;
-
-  return type;
-}
-
-/**
- * MHD_gnutls_x509_crt_get_subject_alt_name - Get certificate's alternative name, if any
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @seq: specifies the sequence number of the alt name (0 for the first one, 1 for the second etc.)
- * @ret: is the place where the alternative name will be copied to
- * @ret_size: holds the size of ret.
- * @critical: will be non zero if the extension is marked as critical (may be null)
- *
- * This function will return the alternative names, contained in the
- * given certificate.
- *
- * This is specified in X509v3 Certificate Extensions.  GNUTLS will
- * return the Alternative name (2.5.29.17), or a negative error code.
- *
- * When the SAN type is otherName, it will extract the data in the
- * otherName's value field, and %GNUTLS_SAN_OTHERNAME is returned.
- * You may use MHD_gnutls_x509_crt_get_subject_alt_othername_oid() to get
- * the corresponding OID and the "virtual" SAN types (e.g.,
- * %GNUTLS_SAN_OTHERNAME_XMPP).
- *
- * If an otherName OID is known, the data will be decoded.  Otherwise
- * the returned data will be DER encoded, and you will have to decode
- * it yourself.  Currently, only the RFC 3920 id-on-xmppAddr SAN is
- * recognized.
- *
- * Returns the alternative subject name type on success.  The type is
- * one of the enumerated MHD_gnutls_x509_subject_alt_name_t.  It will
- * return %GNUTLS_E_SHORT_MEMORY_BUFFER if @ret_size is not large
- * enough to hold the value.  In that case @ret_size will be updated
- * with the required size.  If the certificate does not have an
- * Alternative name with the specified sequence number then
- * %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE is returned.
- *
- **/
-int
-MHD_gnutls_x509_crt_get_subject_alt_name (MHD_gnutls_x509_crt_t cert,
-                                          unsigned int seq,
-                                          void *ret,
-                                          size_t * ret_size,
-                                          unsigned int *critical)
-{
-  return get_subject_alt_name (cert, seq, ret, ret_size, NULL, critical, 0);
-}
-
-/**
- * MHD_gnutls_x509_crt_get_basic_constraints - This function returns the certificate basic constraints
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @critical: will be non zero if the extension is marked as critical
- * @ca: pointer to output integer indicating CA status, may be NULL,
- *   value is 1 if the certificate CA flag is set, 0 otherwise.
- * @pathlen: pointer to output integer indicating path length (may be
- *   NULL), non-negative values indicate a present pathLenConstraint
- *   field and the actual value, -1 indicate that the field is absent.
- *
- * This function will read the certificate's basic constraints, and
- * return the certificates CA status.  It reads the basicConstraints
- * X.509 extension (2.5.29.19).
- *
- * Return value: If the certificate is a CA a positive value will be
- * returned, or zero if the certificate does not have CA flag set.  A
- * negative value may be returned in case of errors.  If the
- * certificate does not contain the basicConstraints extension
- * GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE will be returned.
- **/
-static int
-MHD_gnutls_x509_crt_get_basic_constraints (MHD_gnutls_x509_crt_t cert,
-                                           unsigned int *critical,
-                                           int *ca, int *pathlen)
-{
-  int result;
-  MHD_gnutls_datum_t basicConstraints;
-  int tmp_ca;
-
-  if (cert == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_INVALID_REQUEST;
-    }
-
-  if ((result = MHD__gnutls_x509_crt_get_extension (cert, "2.5.29.19", 0,
-                                                    &basicConstraints,
-                                                    critical)) < 0)
-    {
-      return result;
-    }
-
-  if (basicConstraints.size == 0 || basicConstraints.data == NULL)
-    {
-      MHD_gnutls_assert ();
-      return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
-    }
-
-  result = MHD__gnutls_x509_ext_extract_basicConstraints (&tmp_ca, pathlen,
-                                                          basicConstraints.
-                                                          data,
-                                                          basicConstraints.
-                                                          size);
-  if (ca)
-    *ca = tmp_ca;
-  MHD__gnutls_free_datum (&basicConstraints);
-
-  if (result < 0)
-    {
-      MHD_gnutls_assert ();
-      return result;
-    }
-
-  return tmp_ca;
-}
-
-/**
- * MHD_gnutls_x509_crt_get_ca_status - This function returns the certificate CA status
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @critical: will be non zero if the extension is marked as critical
- *
- * This function will return certificates CA status, by reading the
- * basicConstraints X.509 extension (2.5.29.19). If the certificate is
- * a CA a positive value will be returned, or zero if the certificate
- * does not have CA flag set.
- *
- * Use MHD_gnutls_x509_crt_get_basic_constraints() if you want to read the
- * pathLenConstraint field too.
- *
- * A negative value may be returned in case of parsing error.
- * If the certificate does not contain the basicConstraints extension
- * GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE will be returned.
- *
- **/
-int
-MHD_gnutls_x509_crt_get_ca_status (MHD_gnutls_x509_crt_t cert,
-                                   unsigned int *critical)
-{
-  int ca, pathlen;
-  return MHD_gnutls_x509_crt_get_basic_constraints (cert, critical, &ca,
-                                                    &pathlen);
-}
-
 /**
  * MHD_gnutls_x509_crt_get_key_usage - This function returns the certificate's key usage
  * @cert: should contain a MHD_gnutls_x509_crt_t structure
@@ -1013,24 +436,6 @@ cleanup:MHD__asn1_delete_structure (&c2);
 }
 
 /**
- * MHD_gnutls_x509_crt_get_raw_issuer_dn - This function returns the issuer's DN DER encoded
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @start: will hold the starting point of the DN
- *
- * This function will return a pointer to the DER encoded DN structure
- * and the length.
- *
- * Returns 0 on success or a negative value on error.
- *
- **/
-int
-MHD_gnutls_x509_crt_get_raw_issuer_dn (MHD_gnutls_x509_crt_t cert,
-                                       MHD_gnutls_datum_t * start)
-{
-  return MHD__gnutls_x509_crt_get_raw_dn2 (cert, "issuer", start);
-}
-
-/**
  * MHD_gnutls_x509_crt_get_raw_dn - This function returns the subject's DN DER encoded
  * @cert: should contain a MHD_gnutls_x509_crt_t structure
  * @start: will hold the starting point of the DN
@@ -1048,33 +453,6 @@ MHD_gnutls_x509_crt_get_raw_dn (MHD_gnutls_x509_crt_t cert,
   return MHD__gnutls_x509_crt_get_raw_dn2 (cert, "subject", start);
 }
 
-static int
-get_dn (MHD_gnutls_x509_crt_t cert, const char *whom,
-        MHD_gnutls_x509_dn_t * dn)
-{
-  *dn = MHD__asn1_find_node (cert->cert, whom);
-  if (!*dn)
-    return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
-  return 0;
-}
-
-/**
- * MHD_gnutls_x509_crt_get_subject: get opaque subject DN pointer
- * @cert: should contain a MHD_gnutls_x509_crt_t structure
- * @dn: output variable with pointer to opaque DN.
- *
- * Return the Certificate's Subject DN as an opaque data type.  You
- * may use MHD_gnutls_x509_dn_get_rdn_ava() to decode the DN.
- *
- * Returns: Returns 0 on success, or an error code.
- **/
-int
-MHD_gnutls_x509_crt_get_subject (MHD_gnutls_x509_crt_t cert,
-                                 MHD_gnutls_x509_dn_t * dn)
-{
-  return get_dn (cert, "tbsCertificate.subject.rdnSequence", dn);
-}
-
 /**
  * MHD_gnutls_x509_crt_export - This function will export the certificate
  * @cert: Holds the certificate