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

diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index e2cd10ed91..c2436b835f 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1078,23 +1078,23 @@ void proto_register_h235(void) {
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_halfkey,
       { "halfkey", "h235.halfkey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_2048", HFILL }},
     { &hf_h235_modSize,
       { "modSize", "h235.modSize",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_2048", HFILL }},
     { &hf_h235_generator,
       { "generator", "h235.generator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_2048", HFILL }},
     { &hf_h235_x,
       { "x", "h235.x",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_y,
       { "y", "h235.y",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_eckasdhp,
       { "eckasdhp", "h235.eckasdhp",
@@ -1106,7 +1106,7 @@ void proto_register_h235(void) {
         "h235.ECpoint", HFILL }},
     { &hf_h235_modulus,
       { "modulus", "h235.modulus",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_base,
       { "base", "h235.base",
@@ -1114,11 +1114,11 @@ void proto_register_h235(void) {
         "h235.ECpoint", HFILL }},
     { &hf_h235_weierstrassA,
       { "weierstrassA", "h235.weierstrassA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_weierstrassB,
       { "weierstrassB", "h235.weierstrassB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_eckasdh2,
       { "eckasdh2", "h235.eckasdh2",
@@ -1126,7 +1126,7 @@ void proto_register_h235(void) {
         "h235.T_eckasdh2", HFILL }},
     { &hf_h235_fieldSize,
       { "fieldSize", "h235.fieldSize",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_type,
       { "type", "h235.type",
@@ -1134,7 +1134,7 @@ void proto_register_h235(void) {
         "h235.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h235_certificatedata,
       { "certificate", "h235.certificate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_default,
       { "default", "h235.default",
@@ -1198,7 +1198,7 @@ void proto_register_h235(void) {
         "h235.DHset", HFILL }},
     { &hf_h235_challenge,
       { "challenge", "h235.challenge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.ChallengeString", HFILL }},
     { &hf_h235_random,
       { "random", "h235.random",
@@ -1246,7 +1246,7 @@ void proto_register_h235(void) {
         "h235.Element", HFILL }},
     { &hf_h235_octets,
       { "octets", "h235.octets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_integer,
       { "integer", "h235.integer",
@@ -1254,7 +1254,7 @@ void proto_register_h235(void) {
         "h235.INTEGER", HFILL }},
     { &hf_h235_bits,
       { "bits", "h235.bits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING", HFILL }},
     { &hf_h235_name,
       { "name", "h235.name",
@@ -1262,7 +1262,7 @@ void proto_register_h235(void) {
         "h235.BMPString", HFILL }},
     { &hf_h235_flag,
       { "flag", "h235.flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_toBeSigned,
       { "toBeSigned", "h235.toBeSigned",
@@ -1274,15 +1274,15 @@ void proto_register_h235(void) {
         "h235.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h235_signaturedata,
       { "signature", "h235.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING", HFILL }},
     { &hf_h235_encryptedData,
       { "encryptedData", "h235.encryptedData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_hash,
       { "hash", "h235.hash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING", HFILL }},
     { &hf_h235_ranInt,
       { "ranInt", "h235.ranInt",
@@ -1290,19 +1290,19 @@ void proto_register_h235(void) {
         "h235.INTEGER", HFILL }},
     { &hf_h235_iv8,
       { "iv8", "h235.iv8",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.IV8", HFILL }},
     { &hf_h235_iv16,
       { "iv16", "h235.iv16",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.IV16", HFILL }},
     { &hf_h235_iv,
       { "iv", "h235.iv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_clearSalt,
       { "clearSalt", "h235.clearSalt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_cryptoEncryptedToken,
       { "cryptoEncryptedToken", "h235.cryptoEncryptedToken",
@@ -1338,7 +1338,7 @@ void proto_register_h235(void) {
         "h235.ENCRYPTED", HFILL }},
     { &hf_h235_secureChannel,
       { "secureChannel", "h235.secureChannel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.KeyMaterial", HFILL }},
     { &hf_h235_sharedSecret,
       { "sharedSecret", "h235.sharedSecret",
@@ -1354,15 +1354,15 @@ void proto_register_h235(void) {
         "h235.V3KeySyncMaterial", HFILL }},
     { &hf_h235_encryptedSessionKey,
       { "encryptedSessionKey", "h235.encryptedSessionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_encryptedSaltingKey,
       { "encryptedSaltingKey", "h235.encryptedSaltingKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_clearSaltingKey,
       { "clearSaltingKey", "h235.clearSaltingKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_paramSsalt,
       { "paramSsalt", "h235.paramSsalt",
@@ -1374,7 +1374,7 @@ void proto_register_h235(void) {
         "h235.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h235_genericKeyMaterial,
       { "genericKeyMaterial", "h235.genericKeyMaterial",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_SrtpCryptoCapability_item,
       { "SrtpCryptoInfo", "h235.SrtpCryptoInfo",
@@ -1390,7 +1390,7 @@ void proto_register_h235(void) {
         "h235.SrtpSessionParameters", HFILL }},
     { &hf_h235_allowMKI,
       { "allowMKI", "h235.allowMKI",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_SrtpKeys_item,
       { "SrtpKeyParameters", "h235.SrtpKeyParameters",
@@ -1398,11 +1398,11 @@ void proto_register_h235(void) {
         "h235.SrtpKeyParameters", HFILL }},
     { &hf_h235_masterKey,
       { "masterKey", "h235.masterKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_masterSalt,
       { "masterSalt", "h235.masterSalt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_lifetime,
       { "lifetime", "h235.lifetime",
@@ -1426,7 +1426,7 @@ void proto_register_h235(void) {
         "h235.INTEGER_1_128", HFILL }},
     { &hf_h235_value,
       { "value", "h235.value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_kdr,
       { "kdr", "h235.kdr",
@@ -1434,15 +1434,15 @@ void proto_register_h235(void) {
         "h235.INTEGER_0_24", HFILL }},
     { &hf_h235_unencryptedSrtp,
       { "unencryptedSrtp", "h235.unencryptedSrtp",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_unencryptedSrtcp,
       { "unencryptedSrtcp", "h235.unencryptedSrtcp",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_unauthenticatedSrtp,
       { "unauthenticatedSrtp", "h235.unauthenticatedSrtp",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_fecOrder,
       { "fecOrder", "h235.fecOrder",