ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb

svn path=/trunk/; revision=18921

1 files changed, 74 insertions, 74 deletions

diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 3134e8575a..63bb11898c 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -1171,299 +1171,299 @@ void proto_register_acp133(void) {
     { &hf_acp133_ACPPreferredDelivery_PDU,
       { "ACPPreferredDelivery", "acp133.ACPPreferredDelivery",
         FT_UINT32, BASE_DEC, VALS(acp133_ACPPreferredDelivery_vals), 0,
-        "ACPPreferredDelivery", HFILL }},
+        "acp133.ACPPreferredDelivery", HFILL }},
     { &hf_acp133_ALType_PDU,
       { "ALType", "acp133.ALType",
         FT_INT32, BASE_DEC, VALS(acp133_ALType_vals), 0,
-        "ALType", HFILL }},
+        "acp133.ALType", HFILL }},
     { &hf_acp133_Community_PDU,
       { "Community", "acp133.Community",
         FT_UINT32, BASE_DEC, VALS(acp133_Community_vals), 0,
-        "Community", HFILL }},
+        "acp133.Community", HFILL }},
     { &hf_acp133_OnSupported_PDU,
       { "OnSupported", "acp133.OnSupported",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "OnSupported", HFILL }},
+        "acp133.OnSupported", HFILL }},
     { &hf_acp133_ACPLegacyFormat_PDU,
       { "ACPLegacyFormat", "acp133.ACPLegacyFormat",
         FT_INT32, BASE_DEC, VALS(acp133_ACPLegacyFormat_vals), 0,
-        "ACPLegacyFormat", HFILL }},
+        "acp133.ACPLegacyFormat", HFILL }},
     { &hf_acp133_Addressees_PDU,
       { "Addressees", "acp133.Addressees",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Addressees", HFILL }},
+        "acp133.Addressees", HFILL }},
     { &hf_acp133_Classification_PDU,
       { "Classification", "acp133.Classification",
         FT_UINT32, BASE_DEC, VALS(acp133_Classification_vals), 0,
-        "Classification", HFILL }},
+        "acp133.Classification", HFILL }},
     { &hf_acp133_DistributionCode_PDU,
       { "DistributionCode", "acp133.DistributionCode",
         FT_STRING, BASE_NONE, NULL, 0,
-        "DistributionCode", HFILL }},
+        "acp133.DistributionCode", HFILL }},
     { &hf_acp133_JPEG_PDU,
       { "JPEG", "acp133.JPEG",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "JPEG", HFILL }},
+        "acp133.JPEG", HFILL }},
     { &hf_acp133_MonthlyUKMs_PDU,
       { "MonthlyUKMs", "acp133.MonthlyUKMs",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MonthlyUKMs", HFILL }},
+        "acp133.MonthlyUKMs", HFILL }},
     { &hf_acp133_Remarks_PDU,
       { "Remarks", "acp133.Remarks",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Remarks", HFILL }},
+        "acp133.Remarks", HFILL }},
     { &hf_acp133_RIParameters_PDU,
       { "RIParameters", "acp133.RIParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RIParameters", HFILL }},
+        "acp133.RIParameters", HFILL }},
     { &hf_acp133_Kmid_PDU,
       { "Kmid", "acp133.Kmid",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "Kmid", HFILL }},
+        "acp133.Kmid", HFILL }},
     { &hf_acp133_MLReceiptPolicy_PDU,
       { "MLReceiptPolicy", "acp133.MLReceiptPolicy",
         FT_UINT32, BASE_DEC, VALS(acp133_MLReceiptPolicy_vals), 0,
-        "MLReceiptPolicy", HFILL }},
+        "acp133.MLReceiptPolicy", HFILL }},
     { &hf_acp133_DLSubmitPermission_PDU,
       { "DLSubmitPermission", "acp133.DLSubmitPermission",
         FT_UINT32, BASE_DEC, VALS(acp133_DLSubmitPermission_vals), 0,
-        "DLSubmitPermission", HFILL }},
+        "acp133.DLSubmitPermission", HFILL }},
     { &hf_acp133_DLPolicy_PDU,
       { "DLPolicy", "acp133.DLPolicy",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLPolicy", HFILL }},
+        "acp133.DLPolicy", HFILL }},
     { &hf_acp133_AddressCapabilities_PDU,
       { "AddressCapabilities", "acp133.AddressCapabilities",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AddressCapabilities", HFILL }},
+        "acp133.AddressCapabilities", HFILL }},
     { &hf_acp133_Capability_PDU,
       { "Capability", "acp133.Capability",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Capability", HFILL }},
+        "acp133.Capability", HFILL }},
     { &hf_acp133_Addressees_item,
       { "Item", "acp133.Addressees_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Addressees/_item", HFILL }},
+        "acp133.PrintableString_SIZE_1_55", HFILL }},
     { &hf_acp133_ukm_entries,
       { "ukm-entries", "acp133.ukm_entries",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MonthlyUKMs/ukm-entries", HFILL }},
+        "acp133.SEQUENCE_OF_UKMEntry", HFILL }},
     { &hf_acp133_ukm_entries_item,
       { "Item", "acp133.ukm_entries_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MonthlyUKMs/ukm-entries/_item", HFILL }},
+        "acp133.UKMEntry", HFILL }},
     { &hf_acp133_algorithm_identifier,
       { "algorithm-identifier", "acp133.algorithm_identifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_acp133_encrypted,
       { "encrypted", "acp133.encrypted",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "MonthlyUKMs/encrypted", HFILL }},
+        "acp133.BIT_STRING", HFILL }},
     { &hf_acp133_Remarks_item,
       { "Item", "acp133.Remarks_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Remarks/_item", HFILL }},
+        "acp133.PrintableString", HFILL }},
     { &hf_acp133_rI,
       { "rI", "acp133.rI",
         FT_STRING, BASE_NONE, NULL, 0,
-        "RIParameters/rI", HFILL }},
+        "acp133.PrintableString", HFILL }},
     { &hf_acp133_rIType,
       { "rIType", "acp133.rIType",
         FT_UINT32, BASE_DEC, VALS(acp133_T_rIType_vals), 0,
-        "RIParameters/rIType", HFILL }},
+        "acp133.T_rIType", HFILL }},
     { &hf_acp133_minimize,
       { "minimize", "acp133.minimize",
         FT_BOOLEAN, 8, NULL, 0,
-        "RIParameters/minimize", HFILL }},
+        "acp133.BOOLEAN", HFILL }},
     { &hf_acp133_sHD,
       { "sHD", "acp133.sHD",
         FT_STRING, BASE_NONE, NULL, 0,
-        "RIParameters/sHD", HFILL }},
+        "acp133.PrintableString", HFILL }},
     { &hf_acp133_classification,
       { "classification", "acp133.classification",
         FT_UINT32, BASE_DEC, VALS(acp133_Classification_vals), 0,
-        "RIParameters/classification", HFILL }},
+        "acp133.Classification", HFILL }},
     { &hf_acp133_tag,
       { "tag", "acp133.tag",
         FT_NONE, BASE_NONE, NULL, 0,
-        "UKMEntry/tag", HFILL }},
+        "acp133.PairwiseTag", HFILL }},
     { &hf_acp133_ukm,
       { "ukm", "acp133.ukm",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "UKMEntry/ukm", HFILL }},
+        "acp133.OCTET_STRING", HFILL }},
     { &hf_acp133_kmid,
       { "kmid", "acp133.kmid",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "PairwiseTag/kmid", HFILL }},
+        "acp133.Kmid", HFILL }},
     { &hf_acp133_edition,
       { "edition", "acp133.edition",
         FT_INT32, BASE_DEC, NULL, 0,
-        "PairwiseTag/edition", HFILL }},
+        "acp133.INTEGER", HFILL }},
     { &hf_acp133_date,
       { "date", "acp133.date",
         FT_STRING, BASE_NONE, NULL, 0,
-        "PairwiseTag/date", HFILL }},
+        "acp133.UTCTime", HFILL }},
     { &hf_acp133_none,
       { "none", "acp133.none",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MLReceiptPolicy/none", HFILL }},
+        "acp133.NULL", HFILL }},
     { &hf_acp133_insteadOf,
       { "insteadOf", "acp133.insteadOf",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/insteadOf", HFILL }},
+        "acp133.SEQUENCE_OF_GeneralNames", HFILL }},
     { &hf_acp133_insteadOf_item,
       { "Item", "acp133.insteadOf_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/insteadOf/_item", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_acp133_inAdditionTo,
       { "inAdditionTo", "acp133.inAdditionTo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/inAdditionTo", HFILL }},
+        "acp133.SEQUENCE_OF_GeneralNames", HFILL }},
     { &hf_acp133_inAdditionTo_item,
       { "Item", "acp133.inAdditionTo_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MLReceiptPolicy/inAdditionTo/_item", HFILL }},
+        "x509ce.GeneralNames", HFILL }},
     { &hf_acp133_individual,
       { "individual", "acp133.individual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLSubmitPermission/individual", HFILL }},
+        "x411.ORName", HFILL }},
     { &hf_acp133_member_of_dl,
       { "member-of-dl", "acp133.member_of_dl",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLSubmitPermission/member-of-dl", HFILL }},
+        "x411.ORName", HFILL }},
     { &hf_acp133_pattern_match,
       { "pattern-match", "acp133.pattern_match",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLSubmitPermission/pattern-match", HFILL }},
+        "acp133.ORNamePattern", HFILL }},
     { &hf_acp133_member_of_group,
       { "member-of-group", "acp133.member_of_group",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
-        "DLSubmitPermission/member-of-group", HFILL }},
+        "x509if.Name", HFILL }},
     { &hf_acp133_report_propagation,
       { "report-propagation", "acp133.report_propagation",
         FT_INT32, BASE_DEC, VALS(acp133_T_report_propagation_vals), 0,
-        "DLPolicy/report-propagation", HFILL }},
+        "acp133.T_report_propagation", HFILL }},
     { &hf_acp133_report_from_dl,
       { "report-from-dl", "acp133.report_from_dl",
         FT_INT32, BASE_DEC, VALS(acp133_T_report_from_dl_vals), 0,
-        "DLPolicy/report-from-dl", HFILL }},
+        "acp133.T_report_from_dl", HFILL }},
     { &hf_acp133_originating_MTA_report,
       { "originating-MTA-report", "acp133.originating_MTA_report",
         FT_INT32, BASE_DEC, VALS(acp133_T_originating_MTA_report_vals), 0,
-        "DLPolicy/originating-MTA-report", HFILL }},
+        "acp133.T_originating_MTA_report", HFILL }},
     { &hf_acp133_originator_report,
       { "originator-report", "acp133.originator_report",
         FT_INT32, BASE_DEC, VALS(acp133_T_originator_report_vals), 0,
-        "DLPolicy/originator-report", HFILL }},
+        "acp133.T_originator_report", HFILL }},
     { &hf_acp133_return_of_content,
       { "return-of-content", "acp133.return_of_content",
         FT_UINT32, BASE_DEC, VALS(acp133_T_return_of_content_vals), 0,
-        "DLPolicy/return-of-content", HFILL }},
+        "acp133.T_return_of_content", HFILL }},
     { &hf_acp133_priority,
       { "priority", "acp133.priority",
         FT_INT32, BASE_DEC, VALS(acp133_T_priority_vals), 0,
-        "DLPolicy/priority", HFILL }},
+        "acp133.T_priority", HFILL }},
     { &hf_acp133_disclosure_of_other_recipients,
       { "disclosure-of-other-recipients", "acp133.disclosure_of_other_recipients",
         FT_UINT32, BASE_DEC, VALS(acp133_T_disclosure_of_other_recipients_vals), 0,
-        "DLPolicy/disclosure-of-other-recipients", HFILL }},
+        "acp133.T_disclosure_of_other_recipients", HFILL }},
     { &hf_acp133_implicit_conversion_prohibited,
       { "implicit-conversion-prohibited", "acp133.implicit_conversion_prohibited",
         FT_UINT32, BASE_DEC, VALS(acp133_T_implicit_conversion_prohibited_vals), 0,
-        "DLPolicy/implicit-conversion-prohibited", HFILL }},
+        "acp133.T_implicit_conversion_prohibited", HFILL }},
     { &hf_acp133_conversion_with_loss_prohibited,
       { "conversion-with-loss-prohibited", "acp133.conversion_with_loss_prohibited",
         FT_UINT32, BASE_DEC, VALS(acp133_T_conversion_with_loss_prohibited_vals), 0,
-        "DLPolicy/conversion-with-loss-prohibited", HFILL }},
+        "acp133.T_conversion_with_loss_prohibited", HFILL }},
     { &hf_acp133_further_dl_expansion_allowed,
       { "further-dl-expansion-allowed", "acp133.further_dl_expansion_allowed",
         FT_BOOLEAN, 8, NULL, 0,
-        "DLPolicy/further-dl-expansion-allowed", HFILL }},
+        "acp133.BOOLEAN", HFILL }},
     { &hf_acp133_originator_requested_alternate_recipient_removed,
       { "originator-requested-alternate-recipient-removed", "acp133.originator_requested_alternate_recipient_removed",
         FT_BOOLEAN, 8, NULL, 0,
-        "DLPolicy/originator-requested-alternate-recipient-removed", HFILL }},
+        "acp133.BOOLEAN", HFILL }},
     { &hf_acp133_proof_of_delivery,
       { "proof-of-delivery", "acp133.proof_of_delivery",
         FT_INT32, BASE_DEC, VALS(acp133_T_proof_of_delivery_vals), 0,
-        "DLPolicy/proof-of-delivery", HFILL }},
+        "acp133.T_proof_of_delivery", HFILL }},
     { &hf_acp133_requested_delivery_method,
       { "requested-delivery-method", "acp133.requested_delivery_method",
         FT_UINT32, BASE_DEC, VALS(acp133_T_requested_delivery_method_vals), 0,
-        "DLPolicy/requested-delivery-method", HFILL }},
+        "acp133.T_requested_delivery_method", HFILL }},
     { &hf_acp133_unchanged,
       { "unchanged", "acp133.unchanged",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLPolicy/requested-delivery-method/unchanged", HFILL }},
+        "acp133.NULL", HFILL }},
     { &hf_acp133_removed,
       { "removed", "acp133.removed",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLPolicy/requested-delivery-method/removed", HFILL }},
+        "acp133.NULL", HFILL }},
     { &hf_acp133_replaced,
       { "replaced", "acp133.replaced",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "DLPolicy/requested-delivery-method/replaced", HFILL }},
+        "x411.RequestedDeliveryMethod", HFILL }},
     { &hf_acp133_token_encryption_algorithm_preference,
       { "token-encryption-algorithm-preference", "acp133.token_encryption_algorithm_preference",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "DLPolicy/token-encryption-algorithm-preference", HFILL }},
+        "acp133.SEQUENCE_OF_AlgorithmInformation", HFILL }},
     { &hf_acp133_token_encryption_algorithm_preference_item,
       { "Item", "acp133.token_encryption_algorithm_preference_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLPolicy/token-encryption-algorithm-preference/_item", HFILL }},
+        "acp133.AlgorithmInformation", HFILL }},
     { &hf_acp133_token_signature_algorithm_preference,
       { "token-signature-algorithm-preference", "acp133.token_signature_algorithm_preference",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "DLPolicy/token-signature-algorithm-preference", HFILL }},
+        "acp133.SEQUENCE_OF_AlgorithmInformation", HFILL }},
     { &hf_acp133_token_signature_algorithm_preference_item,
       { "Item", "acp133.token_signature_algorithm_preference_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DLPolicy/token-signature-algorithm-preference/_item", HFILL }},
+        "acp133.AlgorithmInformation", HFILL }},
     { &hf_acp133_originator_certificate_selector,
       { "originator-certificate-selector", "acp133.originator_certificate_selector",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AlgorithmInformation/originator-certificate-selector", HFILL }},
+        "x509ce.CertificateAssertion", HFILL }},
     { &hf_acp133_recipient_certificate_selector,
       { "recipient-certificate-selector", "acp133.recipient_certificate_selector",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AlgorithmInformation/recipient-certificate-selector", HFILL }},
+        "x509ce.CertificateAssertion", HFILL }},
     { &hf_acp133_description,
       { "description", "acp133.description",
         FT_STRING, BASE_NONE, NULL, 0,
-        "AddressCapabilities/description", HFILL }},
+        "acp133.GeneralString", HFILL }},
     { &hf_acp133_address,
       { "address", "acp133.address",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AddressCapabilities/address", HFILL }},
+        "x411.ORAddress", HFILL }},
     { &hf_acp133_capabilities,
       { "capabilities", "acp133.capabilities",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AddressCapabilities/capabilities", HFILL }},
+        "acp133.SET_OF_Capability", HFILL }},
     { &hf_acp133_capabilities_item,
       { "Item", "acp133.capabilities_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AddressCapabilities/capabilities/_item", HFILL }},
+        "acp133.Capability", HFILL }},
     { &hf_acp133_content_types,
       { "content-types", "acp133.content_types",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Capability/content-types", HFILL }},
+        "acp133.SET_OF_ExtendedContentType", HFILL }},
     { &hf_acp133_content_types_item,
       { "Item", "acp133.content_types_item",
         FT_OID, BASE_NONE, NULL, 0,
-        "Capability/content-types/_item", HFILL }},
+        "x411.ExtendedContentType", HFILL }},
     { &hf_acp133_maximum_content_length,
       { "maximum-content-length", "acp133.maximum_content_length",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Capability/maximum-content-length", HFILL }},
+        "x411.ContentLength", HFILL }},
     { &hf_acp133_encoded_information_types_constraints,
       { "encoded-information-types-constraints", "acp133.encoded_information_types_constraints",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Capability/encoded-information-types-constraints", HFILL }},
+        "x411.EncodedInformationTypesConstraints", HFILL }},
     { &hf_acp133_security_labels,
       { "security-labels", "acp133.security_labels",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Capability/security-labels", HFILL }},
+        "x411.SecurityContext", HFILL }},
     { &hf_acp133_OnSupported_acp127_nn,
       { "acp127-nn", "acp133.acp127-nn",
         FT_BOOLEAN, 8, NULL, 0x80,