denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse RDNs in multiple SEQUENCEs in all SETs of a DN

Browse Source
This commit is contained in:
Martin Willi
2009-08-03 15:24:48 +02:00
parent 5cb300e795
commit 3d2f73b92f
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/identification.c
+24 -16
View File
@@ -127,8 +127,10 @@ struct private_identification_t {
typedef struct { typedef struct {
/* implements enumerator interface */ /* implements enumerator interface */
enumerator_t public; enumerator_t public;
/* RDNs left to parse */ /* next set to parse, if any */
chunk_t left; chunk_t sets;
/* next sequence in set, if any */
chunk_t seqs;
} rdn_enumerator_t; } rdn_enumerator_t;
/** /**
@@ -139,20 +141,25 @@ static bool rdn_enumerate(rdn_enumerator_t *this, chunk_t *oid,
{ {
chunk_t rdn; chunk_t rdn;
/* a RDN is a SET of attribute-values, each is a SEQUENCE ... */ /* a DN contains one or more SET, each containing one or more SEQUENCES,
if (asn1_unwrap(&this->left, &rdn) == ASN1_SET && * each containing a OID/value RDN */
asn1_unwrap(&rdn, &rdn) == ASN1_SEQUENCE) if (!this->seqs.len)
{ {
/* ... of an OID */ /* no SEQUENCEs in current SET, parse next SET */
if (asn1_unwrap(&rdn, oid) == ASN1_OID) if (asn1_unwrap(&this->sets, &this->seqs) != ASN1_SET)
{ {
/* and a specific string type */ return FALSE;
int t = asn1_unwrap(&rdn, data); }
if (t != ASN1_INVALID) }
{ if (asn1_unwrap(&this->seqs, &rdn) == ASN1_SEQUENCE &&
*type = t; asn1_unwrap(&rdn, oid) == ASN1_OID)
return TRUE; {
} int t = asn1_unwrap(&rdn, data);
if (t != ASN1_INVALID)
{
*type = t;
return TRUE;
} }
} }
return FALSE; return FALSE;
@@ -168,9 +175,10 @@ static enumerator_t* create_rdn_enumerator(chunk_t dn)
e->public.enumerate = (void*)rdn_enumerate; e->public.enumerate = (void*)rdn_enumerate;
e->public.destroy = (void*)free; e->public.destroy = (void*)free;
/* a DN is a sequence of RDNs */ /* a DN is a SEQUENCE, get the first SET of it */
if (asn1_unwrap(&dn, &e->left) == ASN1_SEQUENCE) if (asn1_unwrap(&dn, &e->sets) == ASN1_SEQUENCE)
{ {
e->seqs = chunk_empty;
return &e->public; return &e->public;
} }
free(e); free(e);