Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 18 insertions, 18 deletions

diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 49de976ef7..06bd50a3cf 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-x509sat.c                                                           */
-/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
+/* ../../tools/asn2wrs.py -b -e -p x509sat -c ./x509sat.cnf -s ./packet-x509sat-template -D . SelectedAttributeTypes.asn */
 
 /* Input file: packet-x509sat-template.c */
 
@@ -1901,7 +1901,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.SET_OF_Criteria", HFILL }},
     { &hf_x509sat_and_item,
-      { "and", "x509sat.and_item",
+      { "Criteria", "x509sat.Criteria",
         FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
         "x509sat.Criteria", HFILL }},
     { &hf_x509sat_or,
@@ -1909,7 +1909,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.SET_OF_Criteria", HFILL }},
     { &hf_x509sat_or_item,
-      { "or", "x509sat.or_item",
+      { "Criteria", "x509sat.Criteria",
         FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
         "x509sat.Criteria", HFILL }},
     { &hf_x509sat_not,
@@ -1941,7 +1941,7 @@ void proto_register_x509sat(void) {
         FT_INT32, BASE_DEC, VALS(x509sat_T_subset_vals), 0,
         "x509sat.T_subset", HFILL }},
     { &hf_x509sat_PostalAddress_item,
-      { "PostalAddress", "x509sat.PostalAddress_item",
+      { "DirectoryString", "x509sat.DirectoryString",
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "x509sat.DirectoryString", HFILL }},
     { &hf_x509sat_telexNumber,
@@ -1965,7 +1965,7 @@ void proto_register_x509sat(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "x411.G3FacsimileNonBasicParameters", HFILL }},
     { &hf_x509sat_PreferredDeliveryMethod_item,
-      { "PreferredDeliveryMethod", "x509sat.PreferredDeliveryMethod_item",
+      { "PreferredDeliveryMethod item", "x509sat.PreferredDeliveryMethod_item",
         FT_INT32, BASE_DEC, VALS(x509sat_PreferredDeliveryMethod_item_vals), 0,
         "x509sat.PreferredDeliveryMethod_item", HFILL }},
     { &hf_x509sat_pSelector,
@@ -1985,7 +1985,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.T_nAddresses", HFILL }},
     { &hf_x509sat_nAddresses_item,
-      { "nAddresses", "x509sat.nAddresses_item",
+      { "nAddresses item", "x509sat.nAddresses_item",
         FT_BYTES, BASE_HEX, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_nAddress,
@@ -1997,7 +1997,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.T_profiles", HFILL }},
     { &hf_x509sat_profiles_item,
-      { "profiles", "x509sat.profiles_item",
+      { "profiles item", "x509sat.profiles_item",
         FT_OID, BASE_NONE, NULL, 0,
         "x509sat.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509sat_dn,
@@ -2017,11 +2017,11 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.SEQUENCE_OF_AttributeValueAssertion", HFILL }},
     { &hf_x509sat_attributeList_item,
-      { "attributeList", "x509sat.attributeList_item",
+      { "AttributeValueAssertion", "x509sat.AttributeValueAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.AttributeValueAssertion", HFILL }},
     { &hf_x509sat_SubstringAssertion_item,
-      { "SubstringAssertion", "x509sat.SubstringAssertion_item",
+      { "SubstringAssertion item", "x509sat.SubstringAssertion_item",
         FT_UINT32, BASE_DEC, VALS(x509sat_SubstringAssertion_item_vals), 0,
         "x509sat.SubstringAssertion_item", HFILL }},
     { &hf_x509sat_initial,
@@ -2041,11 +2041,11 @@ void proto_register_x509sat(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.Attribute", HFILL }},
     { &hf_x509sat_CaseIgnoreListMatch_item,
-      { "CaseIgnoreListMatch", "x509sat.CaseIgnoreListMatch_item",
+      { "DirectoryString", "x509sat.DirectoryString",
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "x509sat.DirectoryString", HFILL }},
     { &hf_x509sat_OctetSubstringAssertion_item,
-      { "OctetSubstringAssertion", "x509sat.OctetSubstringAssertion_item",
+      { "OctetSubstringAssertion item", "x509sat.OctetSubstringAssertion_item",
         FT_UINT32, BASE_DEC, VALS(x509sat_OctetSubstringAssertion_item_vals), 0,
         "x509sat.OctetSubstringAssertion_item", HFILL }},
     { &hf_x509sat_initial_substring,
@@ -2061,7 +2061,7 @@ void proto_register_x509sat(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_ZonalSelect_item,
-      { "ZonalSelect", "x509sat.ZonalSelect_item",
+      { "AttributeType", "x509sat.AttributeType",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.AttributeType", HFILL }},
     { &hf_x509sat_time,
@@ -2085,7 +2085,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.SET_OF_Period", HFILL }},
     { &hf_x509sat_periodic_item,
-      { "periodic", "x509sat.periodic_item",
+      { "Period", "x509sat.Period",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509sat.Period", HFILL }},
     { &hf_x509sat_notThisTime,
@@ -2101,7 +2101,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.SET_OF_DayTimeBand", HFILL }},
     { &hf_x509sat_timesOfDay_item,
-      { "timesOfDay", "x509sat.timesOfDay_item",
+      { "DayTimeBand", "x509sat.DayTimeBand",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509sat.DayTimeBand", HFILL }},
     { &hf_x509sat_days,
@@ -2113,7 +2113,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.T_intDay", HFILL }},
     { &hf_x509sat_intDay_item,
-      { "intDay", "x509sat.intDay_item",
+      { "intDay item", "x509sat.intDay_item",
         FT_INT32, BASE_DEC, NULL, 0,
         "x509sat.INTEGER", HFILL }},
     { &hf_x509sat_bitDay,
@@ -2137,7 +2137,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.T_intWeek", HFILL }},
     { &hf_x509sat_intWeek_item,
-      { "intWeek", "x509sat.intWeek_item",
+      { "intWeek item", "x509sat.intWeek_item",
         FT_INT32, BASE_DEC, NULL, 0,
         "x509sat.INTEGER", HFILL }},
     { &hf_x509sat_bitWeek,
@@ -2157,7 +2157,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.T_intMonth", HFILL }},
     { &hf_x509sat_intMonth_item,
-      { "intMonth", "x509sat.intMonth_item",
+      { "intMonth item", "x509sat.intMonth_item",
         FT_INT32, BASE_DEC, NULL, 0,
         "x509sat.INTEGER", HFILL }},
     { &hf_x509sat_bitMonth,
@@ -2169,7 +2169,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x509sat.T_years", HFILL }},
     { &hf_x509sat_years_item,
-      { "years", "x509sat.years_item",
+      { "years item", "x509sat.years_item",
         FT_INT32, BASE_DEC, NULL, 0,
         "x509sat.INTEGER", HFILL }},
     { &hf_x509sat_first_dayof,