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

diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 6f6226cb82..2598416158 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -933,11 +933,11 @@ void proto_register_x509af(void) {
     { &hf_x509af_algorithm_id,
       { "Algorithm Id", "x509af.algorithm.id",
         FT_OID, BASE_NONE, NULL, 0,
-        "Algorithm Id", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_extension_id,
       { "Extension Id", "x509af.extension.id",
         FT_OID, BASE_NONE, NULL, 0,
-        "Extension Id", HFILL }},
+        NULL, HFILL }},
 
 /*--- Included file: packet-x509af-hfarr.c ---*/
 #line 1 "packet-x509af-hfarr.c"
@@ -995,11 +995,11 @@ void proto_register_x509af(void) {
         "x509af.SubjectPublicKeyInfo", HFILL }},
     { &hf_x509af_issuerUniqueIdentifier,
       { "issuerUniqueIdentifier", "x509af.issuerUniqueIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_subjectUniqueIdentifier,
       { "subjectUniqueIdentifier", "x509af.subjectUniqueIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_extensions,
       { "extensions", "x509af.extensions",
@@ -1011,7 +1011,7 @@ void proto_register_x509af(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x509af_encrypted,
       { "encrypted", "x509af.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509af.BIT_STRING", HFILL }},
     { &hf_x509af_rdnSequence,
       { "rdnSequence", "x509af.rdnSequence",
@@ -1039,7 +1039,7 @@ void proto_register_x509af(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x509af_subjectPublicKey,
       { "subjectPublicKey", "x509af.subjectPublicKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509af.BIT_STRING", HFILL }},
     { &hf_x509af_utcTime,
       { "utcTime", "x509af.utcTime",
@@ -1059,11 +1059,11 @@ void proto_register_x509af(void) {
         "x509af.T_extnId", HFILL }},
     { &hf_x509af_critical,
       { "critical", "x509af.critical",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509af.BOOLEAN", HFILL }},
     { &hf_x509af_extnValue,
       { "extnValue", "x509af.extnValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509af.T_extnValue", HFILL }},
     { &hf_x509af_userCertificate,
       { "userCertificate", "x509af.userCertificate",
@@ -1183,7 +1183,7 @@ void proto_register_x509af(void) {
         "x509if.Attribute", HFILL }},
     { &hf_x509af_issuerUniqueID,
       { "issuerUniqueID", "x509af.issuerUniqueID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_serial,
       { "serial", "x509af.serial",
@@ -1191,7 +1191,7 @@ void proto_register_x509af(void) {
         "x509af.CertificateSerialNumber", HFILL }},
     { &hf_x509af_issuerUID,
       { "issuerUID", "x509af.issuerUID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_notBeforeTime,
       { "notBeforeTime", "x509af.notBeforeTime",