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

diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index 0e5ecfdf0e..e8ff8ef7f7 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -967,11 +967,11 @@ void proto_register_crmf(void) {
         "pkix1explicit.SubjectPublicKeyInfo", HFILL }},
     { &hf_crmf_issuerUID,
       { "issuerUID", "crmf.issuerUID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.UniqueIdentifier", HFILL }},
     { &hf_crmf_subjectUID,
       { "subjectUID", "crmf.subjectUID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.UniqueIdentifier", HFILL }},
     { &hf_crmf_extensions,
       { "extensions", "crmf.extensions",
@@ -1023,7 +1023,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_sk_signature,
       { "signature", "crmf.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_authInfo,
       { "authInfo", "crmf.authInfo",
@@ -1043,11 +1043,11 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_pkmac_value,
       { "value", "crmf.value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_salt,
       { "salt", "crmf.salt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_owf,
       { "owf", "crmf.owf",
@@ -1063,7 +1063,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_thisMessage,
       { "thisMessage", "crmf.thisMessage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_subsequentMessage,
       { "subsequentMessage", "crmf.subsequentMessage",
@@ -1071,7 +1071,7 @@ void proto_register_crmf(void) {
         "crmf.SubsequentMessage", HFILL }},
     { &hf_crmf_dhMAC,
       { "dhMAC", "crmf.dhMAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_agreeMAC,
       { "agreeMAC", "crmf.agreeMAC",
@@ -1107,11 +1107,11 @@ void proto_register_crmf(void) {
         "crmf.EncryptedKey", HFILL }},
     { &hf_crmf_keyGenParameters,
       { "keyGenParameters", "crmf.keyGenParameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.KeyGenParameters", HFILL }},
     { &hf_crmf_archiveRemGenPrivKey,
       { "archiveRemGenPrivKey", "crmf.archiveRemGenPrivKey",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "crmf.BOOLEAN", HFILL }},
     { &hf_crmf_encryptedValue,
       { "encryptedValue", "crmf.encryptedValue",
@@ -1131,7 +1131,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_encSymmKey,
       { "encSymmKey", "crmf.encSymmKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_keyAlg,
       { "keyAlg", "crmf.keyAlg",
@@ -1139,11 +1139,11 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_valueHint,
       { "valueHint", "crmf.valueHint",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_encValue,
       { "encValue", "crmf.encValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_issuer,
       { "issuer", "crmf.issuer",
@@ -1175,7 +1175,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_privateKey,
       { "privateKey", "crmf.privateKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_attributes,
       { "attributes", "crmf.attributes",