diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-04-30 12:53:26 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-04-30 12:53:26 +0000 |
| commit | 84764fec2981ce2ea24af2620c947ddc22ad3595 (patch) | |
| tree | a04b8be4810d1ff7ae31fa31e293e54ce9bd3c15 /asn1/x509if | |
| parent | 1ce378de2a489b17065ffa1b88af2fee2c9429d7 (diff) | |
| download | wireshark-84764fec2981ce2ea24af2620c947ddc22ad3595.tar.gz | |
Operational Attributes and Syntaxes
svn path=/trunk/; revision=18048
Diffstat (limited to 'asn1/x509if')
| -rw-r--r-- | asn1/x509if/x509if.cnf | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index f3726d9291..66bfd93c19 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -97,6 +97,14 @@ DistinguishedName B "2.5.4.33" "id-at-roleOccupant" DistinguishedName B "2.5.4.34" "id-at-seeAlso" DistinguishedName B "2.5.4.49" "id-at-distinguishedName" +DistinguishedName B "2.5.18.3" "id-oa-creatorsName" +DistinguishedName B "2.5.18.4" "id-oa-modifiersName" +#SubtreeSpecification B "2.5.18.6" "id-oa-subtreeSpecification" +DistinguishedName B "2.5.18.10" "id-oa-subschemaSubentry" +DistinguishedName B "2.5.18.11" "id-oa-subschemaSubentry" +DistinguishedName B "2.5.18.12" "id-oa-collectiveAttributeSubentry" +DistinguishedName B "2.5.18.13" "id-oa-contextDefaultSubentry" + # X402 - see master list in acp133.cnf DistinguishedName B "2.6.5.2.5" "id-at-mhs-message-store-dn" DistinguishedName B "2.6.5.2.14" "id-at-mhs-dl-related-lists" @@ -117,6 +125,8 @@ DistinguishedName B "2.16.840.1.101.2.2.1.138" "id-at-plasServed" DistinguishedName B "2.16.840.1.101.2.2.1.139" "id-at-deployed" DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" + + #.FN_PARS ContextId FN_VARIANT = _str HF_INDEX = hf_x509if_object_identifier_id VAL_PTR = &object_identifier_id @@ -162,9 +172,14 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" char *value = NULL; const char *fmt; const char *name = NULL; + const char *orig_oid = object_identifier_id; offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + /* in dissecting the value we may have overridden the OID of the value - which is + a problem if there are multiple values */ + object_identifier_id = orig_oid; + /* try and dissect as a string */ dissect_ber_octet_string(FALSE, pinfo, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb); @@ -268,7 +283,6 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" col_append_fstr(pinfo->cinfo, COL_INFO, " %%s%%s", fmt, last_dn); } - last_dn = NULL; #.FN_BODY RDNSequence/_item |