diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-09-12 22:45:55 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-11-03 13:52:47 +0100 |
commit | 50a53427580d3ead5a38e492966bad0524e56d19 (patch) | |
tree | cfea2412f220867e337ee7fc57dbf0aaafe7f464 | |
parent | 3e686ef013dbe016ee09a9ea4fbeca33cc67d853 (diff) | |
download | gnutls-50a53427580d3ead5a38e492966bad0524e56d19.tar.gz |
Use the new asn1_read_node_value()
-rw-r--r-- | lib/x509/x509.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lib/x509/x509.c b/lib/x509/x509.c index 6f82b8b4fc..6db574c2dc 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -2060,10 +2060,12 @@ 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, *ptr; + unsigned char cls; + const unsigned char *ptr; iava++; irdn++; /* 0->1, 1->2 etc */ @@ -2084,8 +2086,15 @@ gnutls_x509_dn_get_rdn_ava (gnutls_x509_dn_t dn, return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND; } - ava->oid.data = elem->value; - ava->oid.size = elem->value_len; + 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); @@ -2095,12 +2104,18 @@ gnutls_x509_dn_get_rdn_ava (gnutls_x509_dn_t dn, 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 = elem->value; - remlen = elem->value_len; + ptr = vnode.value; + remlen = vnode.value_len; len = asn1_get_length_der (ptr, remlen, &lenlen); if (len < 0) { @@ -2131,7 +2146,7 @@ gnutls_x509_dn_get_rdn_ava (gnutls_x509_dn_t dn, } ava->value.size = tmp; } - ava->value.data = ptr + lenlen; + ava->value.data = (void*)(ptr + lenlen); return 0; } |