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

svn path=/trunk/; revision=28770

1 files changed, 14 insertions, 14 deletions

diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 9d6951f9a1..f0619b9249 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1628,7 +1628,7 @@ void proto_register_cms(void) {
         "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_cms_MessageDigest_PDU,
       { "MessageDigest", "cms.MessageDigest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.MessageDigest", HFILL }},
     { &hf_cms_SigningTime_PDU,
       { "SigningTime", "cms.SigningTime",
@@ -1700,7 +1700,7 @@ void proto_register_cms(void) {
         "cms.ContentType", HFILL }},
     { &hf_cms_eContent,
       { "eContent", "cms.eContent",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.T_eContent", HFILL }},
     { &hf_cms_sid,
       { "sid", "cms.sid",
@@ -1720,7 +1720,7 @@ void proto_register_cms(void) {
         "cms.SignatureAlgorithmIdentifier", HFILL }},
     { &hf_cms_signatureValue,
       { "signature", "cms.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.SignatureValue", HFILL }},
     { &hf_cms_unsignedAttrs,
       { "unsignedAttrs", "cms.unsignedAttrs",
@@ -1732,7 +1732,7 @@ void proto_register_cms(void) {
         "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_cms_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "cms.subjectKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.SubjectKeyIdentifier", HFILL }},
     { &hf_cms_SignedAttributes_item,
       { "Attribute", "cms.Attribute",
@@ -1788,7 +1788,7 @@ void proto_register_cms(void) {
         "cms.ContentEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedContent,
       { "encryptedContent", "cms.encryptedContent",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.EncryptedContent", HFILL }},
     { &hf_cms_UnprotectedAttributes_item,
       { "Attribute", "cms.Attribute",
@@ -1816,7 +1816,7 @@ void proto_register_cms(void) {
         "cms.KeyEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedKey,
       { "encryptedKey", "cms.encryptedKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.EncryptedKey", HFILL }},
     { &hf_cms_originator,
       { "originator", "cms.originator",
@@ -1824,7 +1824,7 @@ void proto_register_cms(void) {
         "cms.OriginatorIdentifierOrKey", HFILL }},
     { &hf_cms_ukm,
       { "ukm", "cms.ukm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.UserKeyingMaterial", HFILL }},
     { &hf_cms_recipientEncryptedKeys,
       { "recipientEncryptedKeys", "cms.recipientEncryptedKeys",
@@ -1840,7 +1840,7 @@ void proto_register_cms(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_cms_publicKey,
       { "publicKey", "cms.publicKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.BIT_STRING", HFILL }},
     { &hf_cms_RecipientEncryptedKeys_item,
       { "RecipientEncryptedKey", "cms.RecipientEncryptedKey",
@@ -1868,11 +1868,11 @@ void proto_register_cms(void) {
         "cms.KEKIdentifier", HFILL }},
     { &hf_cms_keyIdentifier,
       { "keyIdentifier", "cms.keyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.OCTET_STRING", HFILL }},
     { &hf_cms_digest,
       { "digest", "cms.digest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.Digest", HFILL }},
     { &hf_cms_macAlgorithm,
       { "macAlgorithm", "cms.macAlgorithm",
@@ -1884,7 +1884,7 @@ void proto_register_cms(void) {
         "cms.AuthAttributes", HFILL }},
     { &hf_cms_mac,
       { "mac", "cms.mac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.MessageAuthenticationCode", HFILL }},
     { &hf_cms_unauthenticatedAttributes,
       { "unauthenticatedAttributes", "cms.unauthenticatedAttributes",
@@ -1948,7 +1948,7 @@ void proto_register_cms(void) {
         "cms.INTEGER", HFILL }},
     { &hf_cms_iv,
       { "iv", "cms.iv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.OCTET_STRING", HFILL }},
     { &hf_cms_extendedCertificateInfo,
       { "extendedCertificateInfo", "cms.extendedCertificateInfo",
@@ -1956,7 +1956,7 @@ void proto_register_cms(void) {
         "cms.ExtendedCertificateInfo", HFILL }},
     { &hf_cms_signature,
       { "signature", "cms.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.Signature", HFILL }},
     { &hf_cms_attributes,
       { "attributes", "cms.attributes",
@@ -1980,7 +1980,7 @@ void proto_register_cms(void) {
         "cms.RecipientKeyIdentifier", HFILL }},
     { &hf_cms_subjectAltKeyIdentifier,
       { "subjectAltKeyIdentifier", "cms.subjectAltKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.SubjectKeyIdentifier", HFILL }},
     { &hf_cms_rc2WrapParameter,
       { "rc2WrapParameter", "cms.rc2WrapParameter",