diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-06-05 12:00:57 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-06-05 12:00:57 +0000 |
| commit | 31e45c7a2130ada609c53cef7fb6e630bfb0ae45 (patch) | |
| tree | a1f6be33237edf23b9b6bdb87a1014d78b96736f /asn1/pkcs12/pkcs12.cnf | |
| parent | 368528502eff6bb908da692f67b025ca95e05d26 (diff) | |
not allow #.FN_HDR/FTR for Wireshark types but only for ASN.1 types
it makes interconnection between .cnf file and ASN.1 source more readable
(changes for #.FN_BODY will follow)
svn path=/trunk/; revision=22043
Diffstat (limited to 'asn1/pkcs12/pkcs12.cnf')
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 6e60b9bc3a..562c9027eb 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -81,34 +81,48 @@ AuthenticatedSafe /* restore the original dissector */ dissector_reset_string("ber.oid", "1.2.840.113549.1.7.1"); -#.FN_PARS OBJECT_IDENTIFIER - FN_VARIANT = _str VAL_PTR = &object_identifier_id +#.FN_PARS SafeBag/bagId FN_VARIANT = _str VAL_PTR = &object_identifier_id +#.FN_FTR SafeBag/bagId + append_oid(tree, object_identifier_id); +#.END -#.FN_BODY OBJECT_IDENTIFIER - const char *name = NULL; +#.FN_PARS CertBag/certId FN_VARIANT = _str VAL_PTR = &object_identifier_id +#.FN_FTR CertBag/certId + append_oid(tree, object_identifier_id); +#.END - %(DEFAULT_BODY)s - - name = get_oid_str_name(object_identifier_id); - proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id); +#.FN_PARS CRLBag/crlId FN_VARIANT = _str VAL_PTR = &object_identifier_id +#.FN_FTR CRLBag/crlId + append_oid(tree, object_identifier_id); +#.END + +#.FN_PARS SecretBag/secretId FN_VARIANT = _str VAL_PTR = &object_identifier_id +#.FN_FTR SecretBag/secretId + append_oid(tree, object_identifier_id); +#.END + +#.FN_PARS PKCS12Attribute/attrId FN_VARIANT = _str VAL_PTR = &object_identifier_id +#.FN_FTR PKCS12Attribute/attrId + append_oid(tree, object_identifier_id); +#.END -#.FN_BODY T_bagValue +#.FN_BODY SafeBag/bagValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); -#.FN_BODY T_attrValues_item +#.FN_BODY PKCS12Attribute/attrValues/_item if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); -#.FN_BODY T_certValue +#.FN_BODY CertBag/certValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); -#.FN_BODY T_crlValue +#.FN_BODY CRLBag/crlValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); -#.FN_BODY T_secretValue +#.FN_BODY SecretBag/secretValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); |