Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 41 insertions, 41 deletions

diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 71a3dae2e3..e9d0a7a8b2 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-x509if.c                                                            */
-/* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn ServiceAdministration.asn */
+/* ../../tools/asn2wrs.py -b -e -p x509if -c ./x509if.cnf -s ./packet-x509if-template -D . InformationFramework.asn ServiceAdministration.asn */
 
 /* Input file: packet-x509if-template.c */
 
@@ -2156,7 +2156,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_values", HFILL }},
     { &hf_x509if_values_item,
-      { "values", "x509if.values_item",
+      { "values item", "x509if.values_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_values_item", HFILL }},
     { &hf_x509if_valuesWithContext,
@@ -2164,7 +2164,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_valuesWithContext", HFILL }},
     { &hf_x509if_valuesWithContext_item,
-      { "valuesWithContext", "x509if.valuesWithContext_item",
+      { "valuesWithContext item", "x509if.valuesWithContext_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_valuesWithContext_item", HFILL }},
     { &hf_x509if_value,
@@ -2176,7 +2176,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SET_SIZE_1_MAX_OF_Context", HFILL }},
     { &hf_x509if_contextList_item,
-      { "contextList", "x509if.contextList_item",
+      { "Context", "x509if.Context",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.Context", HFILL }},
     { &hf_x509if_contextType,
@@ -2188,7 +2188,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_contextValues", HFILL }},
     { &hf_x509if_contextValues_item,
-      { "contextValues", "x509if.contextValues_item",
+      { "contextValues item", "x509if.contextValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_contextValues_item", HFILL }},
     { &hf_x509if_fallback,
@@ -2216,7 +2216,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SET_SIZE_1_MAX_OF_ContextAssertion", HFILL }},
     { &hf_x509if_selectedContexts_item,
-      { "selectedContexts", "x509if.selectedContexts_item",
+      { "ContextAssertion", "x509if.ContextAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.ContextAssertion", HFILL }},
     { &hf_x509if_ca_contextType,
@@ -2228,7 +2228,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_ca_contextValues", HFILL }},
     { &hf_x509if_ca_contextValues_item,
-      { "contextValues", "x509if.contextValues_item",
+      { "contextValues item", "x509if.contextValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_ca_contextValues_item", HFILL }},
     { &hf_x509if_type_02,
@@ -2240,7 +2240,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_ContextAssertion", HFILL }},
     { &hf_x509if_ata_assertedContexts_item,
-      { "assertedContexts", "x509if.assertedContexts_item",
+      { "ContextAssertion", "x509if.ContextAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.ContextAssertion", HFILL }},
     { &hf_x509if_rdnSequence,
@@ -2248,11 +2248,11 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.RDNSequence", HFILL }},
     { &hf_x509if_RDNSequence_item,
-      { "RDNSequence", "x509if.RDNSequence_item",
+      { "RDNSequence item", "x509if.RDNSequence_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.RDNSequence_item", HFILL }},
     { &hf_x509if_RelativeDistinguishedName_item,
-      { "RelativeDistinguishedName", "x509if.RelativeDistinguishedName_item",
+      { "RelativeDistinguishedName item", "x509if.RelativeDistinguishedName_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.RelativeDistinguishedName_item", HFILL }},
     { &hf_x509if_type_03,
@@ -2272,7 +2272,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_valWithContext", HFILL }},
     { &hf_x509if_valueswithContext_item,
-      { "valuesWithContext", "x509if.valuesWithContext_item",
+      { "valuesWithContext item", "x509if.valuesWithContext_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_valWithContext_item", HFILL }},
     { &hf_x509if_distingAttrValue,
@@ -2284,7 +2284,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_chopSpecificExclusions", HFILL }},
     { &hf_x509if_chopSpecificExclusions_item,
-      { "specificExclusions", "x509if.specificExclusions_item",
+      { "specificExclusions item", "x509if.specificExclusions_item",
         FT_UINT32, BASE_DEC, VALS(x509if_T_chopSpecificExclusions_item_vals), 0,
         "x509if.T_chopSpecificExclusions_item", HFILL }},
     { &hf_x509if_chopBefore,
@@ -2312,7 +2312,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SET_OF_Refinement", HFILL }},
     { &hf_x509if_refinement_and_item,
-      { "and", "x509if.and_item",
+      { "Refinement", "x509if.Refinement",
         FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,
         "x509if.Refinement", HFILL }},
     { &hf_x509if_refinement_or,
@@ -2320,7 +2320,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SET_OF_Refinement", HFILL }},
     { &hf_x509if_refinement_or_item,
-      { "or", "x509if.or_item",
+      { "Refinement", "x509if.Refinement",
         FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,
         "x509if.Refinement", HFILL }},
     { &hf_x509if_refinement_not,
@@ -2340,7 +2340,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SET_SIZE_1_MAX_OF_RuleIdentifier", HFILL }},
     { &hf_x509if_superiorStructureRules_item,
-      { "superiorStructureRules", "x509if.superiorStructureRules_item",
+      { "RuleIdentifier", "x509if.RuleIdentifier",
         FT_INT32, BASE_DEC, NULL, 0,
         "x509if.RuleIdentifier", HFILL }},
     { &hf_x509if_structuralObjectClass,
@@ -2352,7 +2352,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_auxiliaries", HFILL }},
     { &hf_x509if_auxiliaries_item,
-      { "auxiliaries", "x509if.auxiliaries_item",
+      { "auxiliaries item", "x509if.auxiliaries_item",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509if_mandatory,
@@ -2360,7 +2360,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_mandatory", HFILL }},
     { &hf_x509if_mandatory_item,
-      { "mandatory", "x509if.mandatory_item",
+      { "mandatory item", "x509if.mandatory_item",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509if_optional,
@@ -2368,7 +2368,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_optional", HFILL }},
     { &hf_x509if_optional_item,
-      { "optional", "x509if.optional_item",
+      { "optional item", "x509if.optional_item",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509if_precluded,
@@ -2376,7 +2376,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_precluded", HFILL }},
     { &hf_x509if_precluded_item,
-      { "precluded", "x509if.precluded_item",
+      { "precluded item", "x509if.precluded_item",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509if_attributeType,
@@ -2388,7 +2388,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_mandatoryContexts", HFILL }},
     { &hf_x509if_mandatoryContexts_item,
-      { "mandatoryContexts", "x509if.mandatoryContexts_item",
+      { "mandatoryContexts item", "x509if.mandatoryContexts_item",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509if_optionalContexts,
@@ -2396,7 +2396,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_optionalContexts", HFILL }},
     { &hf_x509if_optionalContexts_item,
-      { "optionalContexts", "x509if.optionalContexts_item",
+      { "optionalContexts item", "x509if.optionalContexts_item",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509if_id,
@@ -2420,7 +2420,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_ra_selectedValues", HFILL }},
     { &hf_x509if_ra_selectedValues_item,
-      { "selectedValues", "x509if.selectedValues_item",
+      { "selectedValues item", "x509if.selectedValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_ra_selectedValues_item", HFILL }},
     { &hf_x509if_defaultValues,
@@ -2428,7 +2428,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_defaultValues", HFILL }},
     { &hf_x509if_defaultValues_item,
-      { "defaultValues", "x509if.defaultValues_item",
+      { "defaultValues item", "x509if.defaultValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_defaultValues_item", HFILL }},
     { &hf_x509if_entryType,
@@ -2440,7 +2440,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_ra_values", HFILL }},
     { &hf_x509if_ra_values_item,
-      { "values", "x509if.values_item",
+      { "values item", "x509if.values_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_ra_values_item", HFILL }},
     { &hf_x509if_contexts,
@@ -2448,7 +2448,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_0_MAX_OF_ContextProfile", HFILL }},
     { &hf_x509if_contexts_item,
-      { "contexts", "x509if.contexts_item",
+      { "ContextProfile", "x509if.ContextProfile",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.ContextProfile", HFILL }},
     { &hf_x509if_contextCombination,
@@ -2460,7 +2460,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_MatchingUse", HFILL }},
     { &hf_x509if_matchingUse_item,
-      { "matchingUse", "x509if.matchingUse_item",
+      { "MatchingUse", "x509if.MatchingUse",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.MatchingUse", HFILL }},
     { &hf_x509if_contextType_01,
@@ -2472,7 +2472,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_contextValue", HFILL }},
     { &hf_x509if_contextValue_item,
-      { "contextValue", "x509if.contextValue_item",
+      { "contextValue item", "x509if.contextValue_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_contextValue_item", HFILL }},
     { &hf_x509if_context,
@@ -2484,7 +2484,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_OF_ContextCombination", HFILL }},
     { &hf_x509if_contextcombination_and_item,
-      { "and", "x509if.and_item",
+      { "ContextCombination", "x509if.ContextCombination",
         FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0,
         "x509if.ContextCombination", HFILL }},
     { &hf_x509if_contextcombination_or,
@@ -2492,7 +2492,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_OF_ContextCombination", HFILL }},
     { &hf_x509if_contextcombination_or_item,
-      { "or", "x509if.or_item",
+      { "ContextCombination", "x509if.ContextCombination",
         FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0,
         "x509if.ContextCombination", HFILL }},
     { &hf_x509if_contextcombination_not,
@@ -2516,7 +2516,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_OF_AttributeCombination", HFILL }},
     { &hf_x509if_and_item,
-      { "and", "x509if.and_item",
+      { "AttributeCombination", "x509if.AttributeCombination",
         FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0,
         "x509if.AttributeCombination", HFILL }},
     { &hf_x509if_or,
@@ -2524,7 +2524,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_OF_AttributeCombination", HFILL }},
     { &hf_x509if_or_item,
-      { "or", "x509if.or_item",
+      { "AttributeCombination", "x509if.AttributeCombination",
         FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0,
         "x509if.AttributeCombination", HFILL }},
     { &hf_x509if_not,
@@ -2544,7 +2544,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_selectedValues", HFILL }},
     { &hf_x509if_selectedValues_item,
-      { "selectedValues", "x509if.selectedValues_item",
+      { "selectedValues item", "x509if.selectedValues_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.T_selectedValues_item", HFILL }},
     { &hf_x509if_matchedValuesOnly,
@@ -2584,7 +2584,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_MRMapping", HFILL }},
     { &hf_x509if_tightenings_item,
-      { "tightenings", "x509if.tightenings_item",
+      { "MRMapping", "x509if.MRMapping",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.MRMapping", HFILL }},
     { &hf_x509if_relaxations,
@@ -2592,7 +2592,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_MRMapping", HFILL }},
     { &hf_x509if_relaxations_item,
-      { "relaxations", "x509if.relaxations_item",
+      { "MRMapping", "x509if.MRMapping",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.MRMapping", HFILL }},
     { &hf_x509if_maximum_relaxation,
@@ -2608,7 +2608,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_Mapping", HFILL }},
     { &hf_x509if_mapping_item,
-      { "mapping", "x509if.mapping_item",
+      { "Mapping", "x509if.Mapping",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.Mapping", HFILL }},
     { &hf_x509if_substitution,
@@ -2616,7 +2616,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_MRSubstitution", HFILL }},
     { &hf_x509if_substitution_item,
-      { "substitution", "x509if.substitution_item",
+      { "MRSubstitution", "x509if.MRSubstitution",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.MRSubstitution", HFILL }},
     { &hf_x509if_mappingFunction,
@@ -2644,7 +2644,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.T_specificExclusions", HFILL }},
     { &hf_x509if_specificExclusions_item,
-      { "specificExclusions", "x509if.specificExclusions_item",
+      { "specificExclusions item", "x509if.specificExclusions_item",
         FT_UINT32, BASE_DEC, VALS(x509if_T_specificExclusions_item_vals), 0,
         "x509if.T_specificExclusions_item", HFILL }},
     { &hf_x509if_specificationFilter,
@@ -2664,7 +2664,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_0_MAX_OF_RequestAttribute", HFILL }},
     { &hf_x509if_inputAttributeTypes_item,
-      { "inputAttributeTypes", "x509if.inputAttributeTypes_item",
+      { "RequestAttribute", "x509if.RequestAttribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.RequestAttribute", HFILL }},
     { &hf_x509if_attributeCombination,
@@ -2676,7 +2676,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_ResultAttribute", HFILL }},
     { &hf_x509if_outputAttributeTypes_item,
-      { "outputAttributeTypes", "x509if.outputAttributeTypes_item",
+      { "ResultAttribute", "x509if.ResultAttribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.ResultAttribute", HFILL }},
     { &hf_x509if_defaultControls,
@@ -2708,7 +2708,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SEQUENCE_SIZE_1_MAX_OF_AttributeType", HFILL }},
     { &hf_x509if_additionalControl_item,
-      { "additionalControl", "x509if.additionalControl_item",
+      { "AttributeType", "x509if.AttributeType",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.AttributeType", HFILL }},
     { &hf_x509if_allowedSubset,
@@ -2728,7 +2728,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509if.SET_SIZE_1_MAX_OF_DirectoryString", HFILL }},
     { &hf_x509if_name_item,
-      { "name", "x509if.name_item",
+      { "DirectoryString", "x509if.DirectoryString",
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "x509sat.DirectoryString", HFILL }},
     { &hf_x509if_description,