diff options
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/cdt/cdt.cnf | 12 | ||||
-rw-r--r-- | asn1/cms/cms.cnf | 2 | ||||
-rw-r--r-- | asn1/dap/dap.cnf | 8 | ||||
-rw-r--r-- | asn1/disp/disp.cnf | 6 | ||||
-rw-r--r-- | asn1/ftbp/ftbp.cnf | 4 | ||||
-rw-r--r-- | asn1/gsmmap/gsmmap.cnf | 2 | ||||
-rw-r--r-- | asn1/ldap/ldap.cnf | 4 | ||||
-rw-r--r-- | asn1/logotype-cert-extn/logotype-cert-extn.cnf | 7 | ||||
-rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 8 | ||||
-rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 40 | ||||
-rw-r--r-- | asn1/rtse/rtse.cnf | 4 | ||||
-rw-r--r-- | asn1/s4406/s4406.cnf | 2 | ||||
-rw-r--r-- | asn1/x411/x411.cnf | 16 | ||||
-rw-r--r-- | asn1/x420/x420.cnf | 2 | ||||
-rw-r--r-- | asn1/x509ce/x509ce.cnf | 4 |
15 files changed, 72 insertions, 49 deletions
diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf index aeb7abe2a0..3ec13ff8ce 100644 --- a/asn1/cdt/cdt.cnf +++ b/asn1/cdt/cdt.cnf @@ -9,10 +9,10 @@ CompressedData #.REGISTER CompressedData B "1.3.26.0.4406.0.4.2" "cdt" -#.FN_PARS AlgorithmID_ShortForm +#.FN_PARS AlgorithmID-ShortForm VAL_PTR = &value -#.FN_BODY AlgorithmID_ShortForm +#.FN_BODY AlgorithmID-ShortForm guint32 value; %(DEFAULT_BODY)s @@ -25,10 +25,10 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" val_to_str (value, cdt_AlgorithmID_ShortForm_vals, "unknown")); -#.FN_PARS ContentType_ShortForm +#.FN_PARS ContentType-ShortForm VAL_PTR = &value -#.FN_BODY ContentType_ShortForm +#.FN_BODY ContentType-ShortForm guint32 value; %(DEFAULT_BODY)s @@ -41,10 +41,10 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" val_to_str (value, cdt_ContentType_ShortForm_vals, "unknown")); -#.FN_PARS OBJECT_IDENTIFIER +#.FN_PARS CompressedContentInfo/contentType/contentType-OID FN_VARIANT = _str VAL_PTR = &obj_id -#.FN_BODY OBJECT_IDENTIFIER +#.FN_BODY CompressedContentInfo/contentType/contentType-OID const char *obj_id = NULL; %(DEFAULT_BODY)s diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index d6d36a16a9..b6f7e98b4e 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -154,7 +154,7 @@ EncryptedContentInfo/contentType encryptedContentType cap_tree = tree; } -#.FN_BODY T_parameters +#.FN_BODY SMIMECapability/parameters offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index 65b2f3418e..0fdc31663b 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -236,10 +236,10 @@ TokenData/time utctime col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_LimitProblem_vals, "LimitProblem(%%d)")); } -#.FN_PARS T_subset - VAL_PTR = &subset +#.END -#.FN_BODY T_subset + +#.FN_BODY SearchArgumentData/subset VAL_PTR=&subset guint32 subset; %(DEFAULT_BODY)s @@ -259,7 +259,7 @@ TokenData/time utctime col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", (dn && *dn) ? dn : "(root)"); } -#.FN_BODY T_subordinates_item +#.FN_BODY ListResultData/listInfo/subordinates/_item proto_item *sub_item; %(DEFAULT_BODY)s diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index a135dc5820..8d2ce538ea 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -32,10 +32,10 @@ EstablishParameter B "dop.establish.roleb.2.5.19.1" "shadow-establish-roleb" ModificationParameter B "dop.modify.rolea.2.5.19.1" "shadow-modify-rolea" ModificationParameter B "dop.modify.roleb.2.5.19.1" "shadow-modify-roleb" -#.FN_PARS T_standard - VAL_PTR = &update -#.FN_BODY T_standard + + +#.FN_BODY RequestShadowUpdateArgumentData/requestedStrategy/standard VAL_PTR=&update guint32 update; %(DEFAULT_BODY)s diff --git a/asn1/ftbp/ftbp.cnf b/asn1/ftbp/ftbp.cnf index 3cf87213a1..455dcbafd4 100644 --- a/asn1/ftbp/ftbp.cnf +++ b/asn1/ftbp/ftbp.cnf @@ -19,8 +19,8 @@ FileTransferParameters FileTransferParameters B "2.6.1.11.12" "id-ep-file-transfer" FileTransferData B "2.6.1.4.12" "id-et-file-transfer" -#.FN_BODY T_parameter +#.FN_BODY Contents-Type-Attribute/document-type/parameter /* XXX: Not implemented yet */ -#.FN_BODY T_compression_algorithm_param +#.FN_BODY CompressionParameter/compression-algorithm-param /* XXX: Not implemented yet */
\ No newline at end of file diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf index 3ed8a05781..77036c496e 100644 --- a/asn1/gsmmap/gsmmap.cnf +++ b/asn1/gsmmap/gsmmap.cnf @@ -662,7 +662,7 @@ Component subtree = proto_item_add_subtree(item, ett_gsm_map_LAIFixedLength); dissect_e212_mcc_mnc(parameter_tvb, subtree, 0); -#.FN_PARS OBJECT_IDENTIFIER +#.FN_PARS PrivateExtension/extId FN_VARIANT = _str VAL_PTR = &obj_id #.FN_BODY RadioResourceInformation VAL_PTR = ¶meter_tvb diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index cb7e142d90..af625f61b7 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -328,7 +328,7 @@ ldap_conv_info_t *ldap_info; } -#.FN_BODY T_scope VAL_PTR = &scope +#.FN_BODY SearchRequest/scope VAL_PTR = &scope gint scope; const gchar *valstr; @@ -345,7 +345,7 @@ ldap_conv_info_t *ldap_info; if(ldm_tree) proto_item_append_text(ldm_tree, " %%s", valstr); -#.FN_BODY T_resultCode VAL_PTR = &result +#.FN_BODY LDAPResult/resultCode VAL_PTR = &result const gchar *valstr; diff --git a/asn1/logotype-cert-extn/logotype-cert-extn.cnf b/asn1/logotype-cert-extn/logotype-cert-extn.cnf index 95040d06a0..4f579a0ac2 100644 --- a/asn1/logotype-cert-extn/logotype-cert-extn.cnf +++ b/asn1/logotype-cert-extn/logotype-cert-extn.cnf @@ -14,9 +14,10 @@ LogotypeExtn B "1.3.6.1.5.5.7.1.12" "id-pe-logotype" LogotypeExtn B "1.3.6.1.5.5.7.20.1" "id-pe-logo-loyalty" LogotypeExtn B "1.3.6.1.5.5.7.20.2" "id-pe-logo-background" -#.FN_FTR IA5String - if((hf_index == hf_logotypecertextn_logotypeURI_item) || - (hf_index == hf_logotypecertextn_refStructURI_item)) +#.FN_FTR LogotypeDetails/logotypeURI/_item + PROTO_ITEM_SET_URL(get_ber_last_created_item()); + +#.FN_FTR LogotypeReference/refStructURI/_item PROTO_ITEM_SET_URL(get_ber_last_created_item()); #.NO_EMIT diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 8d4ac23e48..2df5f2df33 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -60,6 +60,14 @@ static void dissect_SafeContents_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pin /* Initialize the subtree pointers */ #include "packet-pkcs12-ett.c" +static void append_oid(proto_tree *tree, const char *oid) +{ + const char *name = NULL; + + name = get_oid_str_name(oid); + proto_item_append_text(tree, " (%%s)", name ? name : oid); +} + #include "packet-pkcs12-fn.c" static int strip_octet_string(tvbuff_t *tvb, proto_tree *tree) 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); diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf index e1048292f3..929adb1e67 100644 --- a/asn1/rtse/rtse.cnf +++ b/asn1/rtse/rtse.cnf @@ -49,7 +49,7 @@ EXTERNALt %(DEFAULT_BODY)s -#.FN_BODY T_open +#.FN_BODY ConnectionData/open char *oid = NULL; @@ -128,7 +128,7 @@ EXTERNALt offset=call_rtse_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree); -#.FN_BODY T_applicationProtocol +#.FN_BODY RTORQapdu/applicationProtocol offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index, &app_proto); diff --git a/asn1/s4406/s4406.cnf b/asn1/s4406/s4406.cnf index 0eb1a238ad..92c09c1f9e 100644 --- a/asn1/s4406/s4406.cnf +++ b/asn1/s4406/s4406.cnf @@ -61,7 +61,7 @@ MMMessageParameters B "1.3.26.0.4406.0.7.10" "mm-message-parameters" InformationObject B "2.6.1.4.17.1.3.26.0.4406.0.4.1" "id-et-content-p772" -#.FN_BODY T_dist_value +#.FN_BODY DistributionExtensionField/dist-value /* XXX: not implemented */ #.FN_PARS PrimaryPrecedence diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index 4337cef508..d232d40612 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -244,7 +244,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" #.FN_BODY RegistrationTypes/extensions/_item /*XXX not implemented yet */ -#.FN_BODY ExtensionValue +#.FN_BODY ExtensionField/value const char *name; if(extension_id != -1) @@ -256,7 +256,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" } -#.FN_BODY CategoryValue +#.FN_BODY SecurityCategory/value offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree); @@ -329,13 +329,13 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" NULL); -#.FN_PARS INTEGER +#.FN_PARS ExtensionType/standard-extension VAL_PTR = &extension_id -#.FN_PARS OBJECT_IDENTIFIER - FN_VARIANT = _str VAL_PTR = &object_identifier_id -#.FN_BODY OBJECT_IDENTIFIER + + +#.FN_BODY ExtensionType/private-extension FN_VARIANT = _str VAL_PTR = &object_identifier_id %(DEFAULT_BODY)s extension_id = -1; @@ -706,11 +706,11 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(credentials, x411_Credentials_vals, "Credentials(%%d)")); } -#.FN_BODY T_value +#.FN_BODY TokenData/value offset=call_x411_oid_callback("x411.tokendata", tvb, offset, actx->pinfo, tree); -#.FN_BODY T_bilateral_information +#.FN_BODY PerDomainBilateralInformation/bilateral-information proto_item *item = NULL; int loffset = 0; guint32 len = 0; diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index f40cd9f917..913a8460c5 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -119,7 +119,7 @@ ForwardedContentParameters B "2.6.1.11.17.1.3.26.0.4406.0.4.1" "id-ep-content- name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id); -#.FN_BODY T_value +#.FN_BODY IPMSExtension/value offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf index 555a8c2ab5..9d4b6039c1 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -123,8 +123,8 @@ CertificatePairExactAssertion/issuedByThisCAAssertion cpea_issuedByThisCAAsserti #.FN_BODY OtherNameValue offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); -#.FN_FTR IA5String - if(hf_index == hf_x509ce_uniformResourceIdentifier) +#.FN_FTR GeneralName/uniformResourceIdentifier + PROTO_ITEM_SET_URL(get_ber_last_created_item()); #.END |