Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599

1 files changed, 34 insertions, 34 deletions

diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index cd70492258..0c88a4a46b 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -899,11 +899,11 @@ void proto_register_crmf(void) {
 /*--- Included file: packet-crmf-hfarr.c ---*/
 #line 1 "../../asn1/crmf/packet-crmf-hfarr.c"
     { &hf_crmf_CertRequest_PDU,
-      { "CertRequest", "crmf.CertRequest",
+      { "CertRequest", "crmf.CertRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_PBMParameter_PDU,
-      { "PBMParameter", "crmf.PBMParameter",
+      { "PBMParameter", "crmf.PBMParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_RegToken_PDU,
@@ -915,7 +915,7 @@ void proto_register_crmf(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_PKIPublicationInfo_PDU,
-      { "PKIPublicationInfo", "crmf.PKIPublicationInfo",
+      { "PKIPublicationInfo", "crmf.PKIPublicationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_PKIArchiveOptions_PDU,
@@ -923,11 +923,11 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, VALS(crmf_PKIArchiveOptions_vals), 0,
         NULL, HFILL }},
     { &hf_crmf_OldCertId_PDU,
-      { "OldCertId", "crmf.OldCertId",
+      { "OldCertId", "crmf.OldCertId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_ProtocolEncrKey_PDU,
-      { "ProtocolEncrKey", "crmf.ProtocolEncrKey",
+      { "ProtocolEncrKey", "crmf.ProtocolEncrKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_UTF8Pairs_PDU,
@@ -935,15 +935,15 @@ void proto_register_crmf(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_EncKeyWithID_PDU,
-      { "EncKeyWithID", "crmf.EncKeyWithID",
+      { "EncKeyWithID", "crmf.EncKeyWithID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_CertReqMessages_item,
-      { "CertReqMsg", "crmf.CertReqMsg",
+      { "CertReqMsg", "crmf.CertReqMsg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_certReq,
-      { "certReq", "crmf.certReq",
+      { "certReq", "crmf.certReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertRequest", HFILL }},
     { &hf_crmf_popo,
@@ -955,7 +955,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue", HFILL }},
     { &hf_crmf_regInfo_item,
-      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue",
+      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_certReqId,
@@ -963,7 +963,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_certTemplate,
-      { "certTemplate", "crmf.certTemplate",
+      { "certTemplate", "crmf.certTemplate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_controls,
@@ -979,7 +979,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_signingAlg,
-      { "signingAlg", "crmf.signingAlg",
+      { "signingAlg", "crmf.signingAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_template_issuer,
@@ -987,7 +987,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Name", HFILL }},
     { &hf_crmf_validity,
-      { "validity", "crmf.validity",
+      { "validity", "crmf.validity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OptionalValidity", HFILL }},
     { &hf_crmf_subject,
@@ -995,7 +995,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Name", HFILL }},
     { &hf_crmf_publicKey,
-      { "publicKey", "crmf.publicKey",
+      { "publicKey", "crmf.publicKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubjectPublicKeyInfo", HFILL }},
     { &hf_crmf_issuerUID,
@@ -1019,7 +1019,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, VALS(pkix1explicit_Time_vals), 0,
         "Time", HFILL }},
     { &hf_crmf_Controls_item,
-      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue",
+      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_type,
@@ -1027,15 +1027,15 @@ void proto_register_crmf(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_value,
-      { "value", "crmf.value",
+      { "value", "crmf.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_raVerified,
-      { "raVerified", "crmf.raVerified",
+      { "raVerified", "crmf.raVerified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_signature,
-      { "signature", "crmf.signature",
+      { "signature", "crmf.signature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "POPOSigningKey", HFILL }},
     { &hf_crmf_keyEncipherment,
@@ -1047,11 +1047,11 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0,
         "POPOPrivKey", HFILL }},
     { &hf_crmf_poposkInput,
-      { "poposkInput", "crmf.poposkInput",
+      { "poposkInput", "crmf.poposkInput_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "POPOSigningKeyInput", HFILL }},
     { &hf_crmf_algorithmIdentifier,
-      { "algorithmIdentifier", "crmf.algorithmIdentifier",
+      { "algorithmIdentifier", "crmf.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_sk_signature,
@@ -1067,11 +1067,11 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralName", HFILL }},
     { &hf_crmf_publicKeyMAC,
-      { "publicKeyMAC", "crmf.publicKeyMAC",
+      { "publicKeyMAC", "crmf.publicKeyMAC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKMACValue", HFILL }},
     { &hf_crmf_algId,
-      { "algId", "crmf.algId",
+      { "algId", "crmf.algId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_pkmac_value,
@@ -1083,7 +1083,7 @@ void proto_register_crmf(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_crmf_owf,
-      { "owf", "crmf.owf",
+      { "owf", "crmf.owf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_iterationCount,
@@ -1091,7 +1091,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_mac,
-      { "mac", "crmf.mac",
+      { "mac", "crmf.mac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_thisMessage,
@@ -1107,11 +1107,11 @@ void proto_register_crmf(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_crmf_agreeMAC,
-      { "agreeMAC", "crmf.agreeMAC",
+      { "agreeMAC", "crmf.agreeMAC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKMACValue", HFILL }},
     { &hf_crmf_encryptedKey,
-      { "encryptedKey", "crmf.encryptedKey",
+      { "encryptedKey", "crmf.encryptedKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EnvelopedData", HFILL }},
     { &hf_crmf_action,
@@ -1123,7 +1123,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo", HFILL }},
     { &hf_crmf_pubInfos_item,
-      { "SinglePubInfo", "crmf.SinglePubInfo",
+      { "SinglePubInfo", "crmf.SinglePubInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_pubMethod,
@@ -1147,19 +1147,19 @@ void proto_register_crmf(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_crmf_encryptedValue,
-      { "encryptedValue", "crmf.encryptedValue",
+      { "encryptedValue", "crmf.encryptedValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_envelopedData,
-      { "envelopedData", "crmf.envelopedData",
+      { "envelopedData", "crmf.envelopedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_intendedAlg,
-      { "intendedAlg", "crmf.intendedAlg",
+      { "intendedAlg", "crmf.intendedAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_symmAlg,
-      { "symmAlg", "crmf.symmAlg",
+      { "symmAlg", "crmf.symmAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_encSymmKey,
@@ -1167,7 +1167,7 @@ void proto_register_crmf(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_crmf_keyAlg,
-      { "keyAlg", "crmf.keyAlg",
+      { "keyAlg", "crmf.keyAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_valueHint,
@@ -1183,7 +1183,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralName", HFILL }},
     { &hf_crmf_enckeywid_privkey,
-      { "privateKey", "crmf.privateKey",
+      { "privateKey", "crmf.privateKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivateKeyInfo", HFILL }},
     { &hf_crmf_identifier,
@@ -1203,7 +1203,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_privateKeyAlgorithm,
-      { "privateKeyAlgorithm", "crmf.privateKeyAlgorithm",
+      { "privateKeyAlgorithm", "crmf.privateKeyAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_privateKey,
@@ -1215,7 +1215,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_Attributes_item,
-      { "Attribute", "crmf.Attribute",
+      { "Attribute", "crmf.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},