Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 32 insertions, 32 deletions

diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index 1f4034c975..1aa2f08f76 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -859,7 +859,7 @@ dissect_dap_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
 
 static const ber_sequence_t T_manageDSAITPlaneRef_sequence[] = {
   { &hf_dap_dsaName         , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_dap_Name },
-  { &hf_dap_agreementID     , -1/*imported*/, -1/*imported*/, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID },
+  { &hf_dap_agreementID     , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -5012,7 +5012,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_OF_AttributeType", HFILL }},
     { &hf_dap_select_item,
-      { "select", "dap.select_item",
+      { "AttributeType", "dap.AttributeType",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.AttributeType", HFILL }},
     { &hf_dap_infoTypes,
@@ -5032,7 +5032,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_SIZE_1_MAX_OF_AttributeType", HFILL }},
     { &hf_dap_extraSelect_item,
-      { "select", "dap.select_item",
+      { "AttributeType", "dap.AttributeType",
         FT_OID, BASE_NONE, NULL, 0,
         "x509if.AttributeType", HFILL }},
     { &hf_dap_contextSelection,
@@ -5056,7 +5056,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_SIZE_1_MAX_OF_TypeAndContextAssertion", HFILL }},
     { &hf_dap_selectedContexts_item,
-      { "selectedContexts", "dap.selectedContexts_item",
+      { "TypeAndContextAssertion", "dap.TypeAndContextAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.TypeAndContextAssertion", HFILL }},
     { &hf_dap_type,
@@ -5072,7 +5072,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_OF_ContextAssertion", HFILL }},
     { &hf_dap_preference_item,
-      { "preference", "dap.preference_item",
+      { "ContextAssertion", "dap.ContextAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.ContextAssertion", HFILL }},
     { &hf_dap_all,
@@ -5080,7 +5080,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_OF_ContextAssertion", HFILL }},
     { &hf_dap_all_item,
-      { "all", "dap.all_item",
+      { "ContextAssertion", "dap.ContextAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.ContextAssertion", HFILL }},
     { &hf_dap_memberSelect,
@@ -5092,7 +5092,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_familySelect", HFILL }},
     { &hf_dap_familySelect_item,
-      { "familySelect", "dap.familySelect_item",
+      { "familySelect item", "dap.familySelect_item",
         FT_OID, BASE_NONE, NULL, 0,
         "dap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_dap_name,
@@ -5108,7 +5108,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_entry_information", HFILL }},
     { &hf_dap_entry_information_item,
-      { "information", "dap.information_item",
+      { "information item", "dap.information_item",
         FT_UINT32, BASE_DEC, VALS(dap_EntryInformationItem_vals), 0,
         "dap.EntryInformationItem", HFILL }},
     { &hf_dap_attributeType,
@@ -5140,7 +5140,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_OF_FamilyEntry", HFILL }},
     { &hf_dap_familyEntries_item,
-      { "familyEntries", "dap.familyEntries_item",
+      { "FamilyEntry", "dap.FamilyEntry",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.FamilyEntry", HFILL }},
     { &hf_dap_rdn,
@@ -5152,7 +5152,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.FamilyInformation", HFILL }},
     { &hf_dap_family_information_item,
-      { "information", "dap.information_item",
+      { "information item", "dap.information_item",
         FT_UINT32, BASE_DEC, VALS(dap_T_family_information_item_vals), 0,
         "dap.T_family_information_item", HFILL }},
     { &hf_dap_family_info,
@@ -5160,7 +5160,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_FamilyEntries", HFILL }},
     { &hf_dap_family_info_item,
-      { "family-info", "dap.family_info_item",
+      { "FamilyEntries", "dap.FamilyEntries",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.FamilyEntries", HFILL }},
     { &hf_dap_filter_item,
@@ -5180,7 +5180,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_Filter_vals), 0,
         "dap.Filter", HFILL }},
     { &hf_dap_SetOfFilter_item,
-      { "SetOfFilter", "dap.SetOfFilter_item",
+      { "Filter", "dap.Filter",
         FT_UINT32, BASE_DEC, VALS(dap_Filter_vals), 0,
         "dap.Filter", HFILL }},
     { &hf_dap_equality,
@@ -5200,7 +5200,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_strings", HFILL }},
     { &hf_dap_strings_item,
-      { "strings", "dap.strings_item",
+      { "strings item", "dap.strings_item",
         FT_UINT32, BASE_DEC, VALS(dap_T_strings_item_vals), 0,
         "dap.T_strings_item", HFILL }},
     { &hf_dap_initial,
@@ -5248,7 +5248,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_matchingRule", HFILL }},
     { &hf_dap_matchingRule_item,
-      { "matchingRule", "dap.matchingRule_item",
+      { "matchingRule item", "dap.matchingRule_item",
         FT_OID, BASE_NONE, NULL, 0,
         "dap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_dap_matchValue,
@@ -5272,7 +5272,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_SortKey", HFILL }},
     { &hf_dap_sortKeys_item,
-      { "sortKeys", "dap.sortKeys_item",
+      { "SortKey", "dap.SortKey",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.SortKey", HFILL }},
     { &hf_dap_reverse,
@@ -5440,7 +5440,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindIntAlgorithm_item,
-      { "bindIntAlgorithm", "dap.bindIntAlgorithm_item",
+      { "AlgorithmIdentifier", "dap.AlgorithmIdentifier",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindIntKeyInfo,
@@ -5452,7 +5452,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindConfAlgorithm_item,
-      { "bindConfAlgorithm", "dap.bindConfAlgorithm_item",
+      { "AlgorithmIdentifier", "dap.AlgorithmIdentifier",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindConfKeyInfo,
@@ -5584,7 +5584,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }},
     { &hf_dap_notification_item,
-      { "notification", "dap.notification_item",
+      { "Attribute", "dap.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.Attribute", HFILL }},
     { &hf_dap_unsignedReadResult,
@@ -5600,7 +5600,7 @@ void proto_register_dap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.ReadResultData", HFILL }},
     { &hf_dap_ModifyRights_item,
-      { "ModifyRights", "dap.ModifyRights_item",
+      { "ModifyRights item", "dap.ModifyRights_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.ModifyRights_item", HFILL }},
     { &hf_dap_item,
@@ -5724,7 +5724,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_subordinates", HFILL }},
     { &hf_dap_subordinates_item,
-      { "subordinates", "dap.subordinates_item",
+      { "subordinates item", "dap.subordinates_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.T_subordinates_item", HFILL }},
     { &hf_dap_aliasEntry,
@@ -5740,7 +5740,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_OF_ListResult", HFILL }},
     { &hf_dap_uncorrelatedListInfo_item,
-      { "uncorrelatedListInfo", "dap.uncorrelatedListInfo_item",
+      { "ListResult", "dap.ListResult",
         FT_UINT32, BASE_DEC, VALS(dap_ListResult_vals), 0,
         "dap.ListResult", HFILL }},
     { &hf_dap_unsignedListResult,
@@ -5764,7 +5764,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_SIZE_1_MAX_OF_ContinuationReference", HFILL }},
     { &hf_dap_unexplored_item,
-      { "unexplored", "dap.unexplored_item",
+      { "ContinuationReference", "dap.ContinuationReference",
         FT_NONE, BASE_NONE, NULL, 0,
         "dsp.ContinuationReference", HFILL }},
     { &hf_dap_unavailableCriticalExtensions,
@@ -5776,7 +5776,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_unknownErrors", HFILL }},
     { &hf_dap_unknownErrors_item,
-      { "unknownErrors", "dap.unknownErrors_item",
+      { "unknownErrors item", "dap.unknownErrors_item",
         FT_OID, BASE_NONE, NULL, 0,
         "dap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_dap_queryReference,
@@ -5856,7 +5856,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_JoinArgument", HFILL }},
     { &hf_dap_joinArguments_item,
-      { "joinArguments", "dap.joinArguments_item",
+      { "JoinArgument", "dap.JoinArgument",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.JoinArgument", HFILL }},
     { &hf_dap_joinType,
@@ -5896,7 +5896,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_JoinAttPair", HFILL }},
     { &hf_dap_joinAttributes_item,
-      { "joinAttributes", "dap.joinAttributes_item",
+      { "JoinAttPair", "dap.JoinAttPair",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.JoinAttPair", HFILL }},
     { &hf_dap_joinSelection,
@@ -5916,7 +5916,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_SIZE_1_MAX_OF_JoinContextType", HFILL }},
     { &hf_dap_joinContext_item,
-      { "joinContext", "dap.joinContext_item",
+      { "JoinContextType", "dap.JoinContextType",
         FT_OID, BASE_NONE, NULL, 0,
         "dap.JoinContextType", HFILL }},
     { &hf_dap_searchInfo,
@@ -5928,7 +5928,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_OF_EntryInformation", HFILL }},
     { &hf_dap_entries_item,
-      { "entries", "dap.entries_item",
+      { "EntryInformation", "dap.EntryInformation",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.EntryInformation", HFILL }},
     { &hf_dap_altMatching,
@@ -5940,7 +5940,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_OF_SearchResult", HFILL }},
     { &hf_dap_uncorrelatedSearchInfo_item,
-      { "uncorrelatedSearchInfo", "dap.uncorrelatedSearchInfo_item",
+      { "SearchResult", "dap.SearchResult",
         FT_UINT32, BASE_DEC, VALS(dap_SearchResult_vals), 0,
         "dap.SearchResult", HFILL }},
     { &hf_dap_unsignedSearchResult,
@@ -5960,7 +5960,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SET_OF_Attribute", HFILL }},
     { &hf_dap_add_entry_item,
-      { "entry", "dap.entry_item",
+      { "Attribute", "dap.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "x509if.Attribute", HFILL }},
     { &hf_dap_targetSystem,
@@ -6028,7 +6028,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.SEQUENCE_OF_EntryModification", HFILL }},
     { &hf_dap_changes_item,
-      { "changes", "dap.changes_item",
+      { "EntryModification", "dap.EntryModification",
         FT_UINT32, BASE_DEC, VALS(dap_EntryModification_vals), 0,
         "dap.EntryModification", HFILL }},
     { &hf_dap_unsignedModifyEntryArgument,
@@ -6148,7 +6148,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_problems", HFILL }},
     { &hf_dap_problems_item,
-      { "problems", "dap.problems_item",
+      { "problems item", "dap.problems_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "dap.T_problems_item", HFILL }},
     { &hf_dap_attribute_error_problem,
@@ -6252,7 +6252,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "dap.T_attributeInfo", HFILL }},
     { &hf_dap_attributeInfo_item,
-      { "attributeInfo", "dap.attributeInfo_item",
+      { "attributeInfo item", "dap.attributeInfo_item",
         FT_UINT32, BASE_DEC, VALS(dap_T_attributeInfo_item_vals), 0,
         "dap.T_attributeInfo_item", HFILL }},
     { &hf_dap_unsignedUpdateError,