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-pkixtsp.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-pkixtsp.c')
-rw-r--r-- | epan/dissectors/packet-pkixtsp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 6a048e1dfa..78ce6cf27e 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -450,7 +450,7 @@ void proto_register_pkixtsp(void) { "pkixtsp.INTEGER", HFILL }}, { &hf_pkixtsp_certReq, { "certReq", "pkixtsp.certReq", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "pkixtsp.BOOLEAN", HFILL }}, { &hf_pkixtsp_extensions, { "extensions", "pkixtsp.extensions", @@ -462,7 +462,7 @@ void proto_register_pkixtsp(void) { "pkix1explicit.AlgorithmIdentifier", HFILL }}, { &hf_pkixtsp_hashedMessage, { "hashedMessage", "pkixtsp.hashedMessage", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkixtsp.OCTET_STRING", HFILL }}, { &hf_pkixtsp_status, { "status", "pkixtsp.status", @@ -478,7 +478,7 @@ void proto_register_pkixtsp(void) { "pkixtsp.PKIStatus", HFILL }}, { &hf_pkixtsp_failInfo, { "failInfo", "pkixtsp.failInfo", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkixtsp.PKIFailureInfo", HFILL }}, { &hf_pkixtsp_tst_version, { "version", "pkixtsp.version", @@ -502,7 +502,7 @@ void proto_register_pkixtsp(void) { "pkixtsp.Accuracy", HFILL }}, { &hf_pkixtsp_ordering, { "ordering", "pkixtsp.ordering", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0x0, "pkixtsp.BOOLEAN", HFILL }}, { &hf_pkixtsp_tsa, { "tsa", "pkixtsp.tsa", @@ -523,35 +523,35 @@ void proto_register_pkixtsp(void) { { &hf_pkixtsp_PKIFailureInfo_badAlg, { "badAlg", "pkixtsp.badAlg", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_badRequest, { "badRequest", "pkixtsp.badRequest", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_badDataFormat, { "badDataFormat", "pkixtsp.badDataFormat", FT_BOOLEAN, 8, NULL, 0x04, - "", HFILL }}, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, { "timeNotAvailable", "pkixtsp.timeNotAvailable", FT_BOOLEAN, 8, NULL, 0x02, - "", HFILL }}, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, { "unacceptedPolicy", "pkixtsp.unacceptedPolicy", FT_BOOLEAN, 8, NULL, 0x01, - "", HFILL }}, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, { "unacceptedExtension", "pkixtsp.unacceptedExtension", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, { "addInfoNotAvailable", "pkixtsp.addInfoNotAvailable", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_pkixtsp_PKIFailureInfo_systemFailure, { "systemFailure", "pkixtsp.systemFailure", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, /*--- End of included file: packet-pkixtsp-hfarr.c ---*/ #line 118 "packet-pkixtsp-template.c" |