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, 18 insertions, 18 deletions

diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index d9b7aff892..ead8860f08 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -705,7 +705,7 @@ void proto_register_ocsp(void) {
 /*--- Included file: packet-ocsp-hfarr.c ---*/
 #line 1 "../../asn1/ocsp/packet-ocsp-hfarr.c"
     { &hf_ocsp_BasicOCSPResponse_PDU,
-      { "BasicOCSPResponse", "ocsp.BasicOCSPResponse",
+      { "BasicOCSPResponse", "ocsp.BasicOCSPResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_ArchiveCutoff_PDU,
@@ -717,23 +717,23 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_ServiceLocator_PDU,
-      { "ServiceLocator", "ocsp.ServiceLocator",
+      { "ServiceLocator", "ocsp.ServiceLocator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_CrlID_PDU,
-      { "CrlID", "ocsp.CrlID",
+      { "CrlID", "ocsp.CrlID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_NULL_PDU,
-      { "NULL", "ocsp.NULL",
+      { "NULL", "ocsp.NULL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_tbsRequest,
-      { "tbsRequest", "ocsp.tbsRequest",
+      { "tbsRequest", "ocsp.tbsRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_optionalSignature,
-      { "optionalSignature", "ocsp.optionalSignature",
+      { "optionalSignature", "ocsp.optionalSignature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Signature", HFILL }},
     { &hf_ocsp_version,
@@ -749,7 +749,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Request", HFILL }},
     { &hf_ocsp_requestList_item,
-      { "Request", "ocsp.Request",
+      { "Request", "ocsp.Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_requestExtensions,
@@ -757,7 +757,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_ocsp_signatureAlgorithm,
-      { "signatureAlgorithm", "ocsp.signatureAlgorithm",
+      { "signatureAlgorithm", "ocsp.signatureAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_ocsp_signature,
@@ -769,11 +769,11 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Certificate", HFILL }},
     { &hf_ocsp_certs_item,
-      { "Certificate", "ocsp.Certificate",
+      { "Certificate", "ocsp.Certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_reqCert,
-      { "reqCert", "ocsp.reqCert",
+      { "reqCert", "ocsp.reqCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertID", HFILL }},
     { &hf_ocsp_singleRequestExtensions,
@@ -781,7 +781,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_ocsp_hashAlgorithm,
-      { "hashAlgorithm", "ocsp.hashAlgorithm",
+      { "hashAlgorithm", "ocsp.hashAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_ocsp_issuerNameHash,
@@ -801,7 +801,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, VALS(ocsp_OCSPResponseStatus_vals), 0,
         "OCSPResponseStatus", HFILL }},
     { &hf_ocsp_responseBytes,
-      { "responseBytes", "ocsp.responseBytes",
+      { "responseBytes", "ocsp.responseBytes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_responseType,
@@ -813,7 +813,7 @@ void proto_register_ocsp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_tbsResponseData,
-      { "tbsResponseData", "ocsp.tbsResponseData",
+      { "tbsResponseData", "ocsp.tbsResponseData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResponseData", HFILL }},
     { &hf_ocsp_responderID,
@@ -829,7 +829,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SingleResponse", HFILL }},
     { &hf_ocsp_responses_item,
-      { "SingleResponse", "ocsp.SingleResponse",
+      { "SingleResponse", "ocsp.SingleResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_responseExtensions,
@@ -845,7 +845,7 @@ void proto_register_ocsp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "KeyHash", HFILL }},
     { &hf_ocsp_certID,
-      { "certID", "ocsp.certID",
+      { "certID", "ocsp.certID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_certStatus,
@@ -865,15 +865,15 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_ocsp_good,
-      { "good", "ocsp.good",
+      { "good", "ocsp.good_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_revoked,
-      { "revoked", "ocsp.revoked",
+      { "revoked", "ocsp.revoked_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RevokedInfo", HFILL }},
     { &hf_ocsp_unknown,
-      { "unknown", "ocsp.unknown",
+      { "unknown", "ocsp.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnknownInfo", HFILL }},
     { &hf_ocsp_revocationTime,