From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 167692f37e..61e76c584d 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -869,7 +869,7 @@ void proto_register_ess(void) {
         "ess.ReceiptRequest", HFILL }},
     { &hf_ess_ContentIdentifier_PDU,
       { "ContentIdentifier", "ess.ContentIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.ContentIdentifier", HFILL }},
     { &hf_ess_Receipt_PDU,
       { "Receipt", "ess.Receipt",
@@ -881,7 +881,7 @@ void proto_register_ess(void) {
         "ess.ContentHints", HFILL }},
     { &hf_ess_MsgSigDigest_PDU,
       { "MsgSigDigest", "ess.MsgSigDigest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.MsgSigDigest", HFILL }},
     { &hf_ess_ContentReference_PDU,
       { "ContentReference", "ess.ContentReference",
@@ -921,7 +921,7 @@ void proto_register_ess(void) {
         "ess.SigningCertificate", HFILL }},
     { &hf_ess_signedContentIdentifier,
       { "signedContentIdentifier", "ess.signedContentIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.ContentIdentifier", HFILL }},
     { &hf_ess_receiptsFrom,
       { "receiptsFrom", "ess.receiptsFrom",
@@ -957,7 +957,7 @@ void proto_register_ess(void) {
         "cms.ContentType", HFILL }},
     { &hf_ess_originatorSignatureValue,
       { "originatorSignatureValue", "ess.originatorSignatureValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.OCTET_STRING", HFILL }},
     { &hf_ess_contentDescription,
       { "contentDescription", "ess.contentDescription",
@@ -1005,7 +1005,7 @@ void proto_register_ess(void) {
         "ess.OBJECT_IDENTIFIER", HFILL }},
     { &hf_ess_attributeFlags,
       { "attributeFlags", "ess.attributeFlags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.BIT_STRING", HFILL }},
     { &hf_ess_attributeList,
       { "attributeList", "ess.attributeList",
@@ -1021,7 +1021,7 @@ void proto_register_ess(void) {
         "ess.FreeFormField", HFILL }},
     { &hf_ess_bitSetAttributes,
       { "bitSetAttributes", "ess.bitSetAttributes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.BIT_STRING", HFILL }},
     { &hf_ess_securityAttributes,
       { "securityAttributes", "ess.securityAttributes",
@@ -1057,7 +1057,7 @@ void proto_register_ess(void) {
         "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_ess_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "ess.subjectKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.SubjectKeyIdentifier", HFILL }},
     { &hf_ess_none,
       { "none", "ess.none",
@@ -1097,7 +1097,7 @@ void proto_register_ess(void) {
         "x509ce.PolicyInformation", HFILL }},
     { &hf_ess_certHash,
       { "certHash", "ess.certHash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.Hash", HFILL }},
     { &hf_ess_issuerSerial,
       { "issuerSerial", "ess.issuerSerial",