Moved the gnutls_x509_dn API functions to x509_dn.cdn-encoding

1 files changed, 0 insertions, 143 deletions

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index da80ff335f..fbfe852a7c 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -2526,149 +2526,6 @@ gnutls_x509_crt_get_issuer(gnutls_x509_crt_t cert, gnutls_x509_dn_t * dn)
 }
 
 /**
- * gnutls_x509_dn_get_rdn_ava:
- * @dn: a pointer to DN
- * @irdn: index of RDN
- * @iava: index of AVA.
- * @ava: Pointer to structure which will hold output information.
- *
- * Get pointers to data within the DN. The format of the @ava structure
- * is shown below.
- *
- *  struct gnutls_x509_ava_st {
- *    gnutls_datum_t oid;
- *    gnutls_datum_t value;
- *    unsigned long value_tag;
- *  };
- *
- * The X.509 distinguished name is a sequence of sequences of strings
- * and this is what the @irdn and @iava indexes model.
- *
- * Note that @ava will contain pointers into the @dn structure which
- * in turns points to the original certificate. Thus you should not
- * modify any data or deallocate any of those.
- *
- * This is a low-level function that requires the caller to do the
- * value conversions when necessary (e.g. from UCS-2).
- *
- * Returns: Returns 0 on success, or an error code.
- **/
-int
-gnutls_x509_dn_get_rdn_ava(gnutls_x509_dn_t dn,
-			   int irdn, int iava, gnutls_x509_ava_st * ava)
-{
-	ASN1_TYPE rdn, elem;
-	ASN1_DATA_NODE vnode;
-	long len;
-	int lenlen, remlen, ret;
-	char rbuf[ASN1_MAX_NAME_SIZE];
-	unsigned char cls;
-	const unsigned char *ptr;
-
-	iava++;
-	irdn++;			/* 0->1, 1->2 etc */
-
-	snprintf(rbuf, sizeof(rbuf), "rdnSequence.?%d.?%d", irdn, iava);
-	rdn = asn1_find_node(dn->asn, rbuf);
-	if (!rdn) {
-		gnutls_assert();
-		return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
-	}
-
-	snprintf(rbuf, sizeof(rbuf), "?%d.type", iava);
-	elem = asn1_find_node(rdn, rbuf);
-	if (!elem) {
-		gnutls_assert();
-		return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
-	}
-
-	ret = asn1_read_node_value(elem, &vnode);
-	if (ret != ASN1_SUCCESS) {
-		gnutls_assert();
-		return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
-	}
-
-	ava->oid.data = (void *) vnode.value;
-	ava->oid.size = vnode.value_len;
-
-	snprintf(rbuf, sizeof(rbuf), "?%d.value", iava);
-	elem = asn1_find_node(rdn, rbuf);
-	if (!elem) {
-		gnutls_assert();
-		return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
-	}
-
-	ret = asn1_read_node_value(elem, &vnode);
-	if (ret != ASN1_SUCCESS) {
-		gnutls_assert();
-		return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
-	}
-	/* The value still has the previous tag's length bytes, plus the
-	 * current value's tag and length bytes. Decode them.
-	 */
-
-	ptr = vnode.value;
-	remlen = vnode.value_len;
-	len = asn1_get_length_der(ptr, remlen, &lenlen);
-	if (len < 0) {
-		gnutls_assert();
-		return GNUTLS_E_ASN1_DER_ERROR;
-	}
-
-	ptr += lenlen;
-	remlen -= lenlen;
-	ret =
-	    asn1_get_tag_der(ptr, remlen, &cls, &lenlen, &ava->value_tag);
-	if (ret) {
-		gnutls_assert();
-		return _gnutls_asn2err(ret);
-	}
-
-	ptr += lenlen;
-	remlen -= lenlen;
-
-	{
-		signed long tmp;
-
-		tmp = asn1_get_length_der(ptr, remlen, &lenlen);
-		if (tmp < 0) {
-			gnutls_assert();
-			return GNUTLS_E_ASN1_DER_ERROR;
-		}
-		ava->value.size = tmp;
-	}
-	ava->value.data = (void *) (ptr + lenlen);
-
-	return 0;
-}
-
-/**
- * gnutls_x509_dn_get_str:
- * @dn: a pointer to DN
- * @str: a datum that will hold the name
- *
- * This function will allocate buffer and copy the name in the provided DN.
- * The name will be in the form "C=xxxx,O=yyyy,CN=zzzz" as
- * described in RFC4514. The output string will be ASCII or UTF-8
- * encoded, depending on the certificate data.
- *
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- *   negative error value.
- *
- * Since: 3.4.2
- **/
-int
-gnutls_x509_dn_get_str(gnutls_x509_dn_t dn, gnutls_datum_t *str)
-{
-	if (dn == NULL) {
-		gnutls_assert();
-		return GNUTLS_E_INVALID_REQUEST;
-	}
-
-	return _gnutls_x509_get_dn(dn->asn, "rdnSequence", str);
-}
-
-/**
  * gnutls_x509_crt_get_fingerprint:
  * @cert: should contain a #gnutls_x509_crt_t type
  * @algo: is a digest algorithm