diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
| commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-pkcs12.c | |
| parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 5e5e0e9ccc..63af09fea4 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -1273,7 +1273,7 @@ void proto_register_pkcs12(void) { "pkcs12.DigestInfo", HFILL }}, { &hf_pkcs12_macSalt, { "macSalt", "pkcs12.macSalt", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkcs12.OCTET_STRING", HFILL }}, { &hf_pkcs12_iterations, { "iterations", "pkcs12.iterations", @@ -1285,7 +1285,7 @@ void proto_register_pkcs12(void) { "cms.DigestAlgorithmIdentifier", HFILL }}, { &hf_pkcs12_digest, { "digest", "pkcs12.digest", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cms.Digest", HFILL }}, { &hf_pkcs12_AuthenticatedSafe_item, { "ContentInfo", "pkcs12.ContentInfo", @@ -1357,7 +1357,7 @@ void proto_register_pkcs12(void) { "x509af.AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_privateKey, { "privateKey", "pkcs12.privateKey", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkcs12.PrivateKey", HFILL }}, { &hf_pkcs12_attributes, { "attributes", "pkcs12.attributes", @@ -1373,11 +1373,11 @@ void proto_register_pkcs12(void) { "x509af.AlgorithmIdentifier", HFILL }}, { &hf_pkcs12_encryptedData, { "encryptedData", "pkcs12.encryptedData", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkcs12.EncryptedData", HFILL }}, { &hf_pkcs12_salt, { "salt", "pkcs12.salt", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkcs12.OCTET_STRING", HFILL }}, { &hf_pkcs12_iterationCount, { "iterationCount", "pkcs12.iterationCount", @@ -1389,7 +1389,7 @@ void proto_register_pkcs12(void) { "pkcs12.T_saltChoice", HFILL }}, { &hf_pkcs12_specified, { "specified", "pkcs12.specified", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkcs12.OCTET_STRING", HFILL }}, { &hf_pkcs12_otherSource, { "otherSource", "pkcs12.otherSource", |