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-cmp.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) | |
download | wireshark-b228488bc0b9d5e0c63b15814836f7332f35ce04.tar.gz |
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-cmp.c')
-rw-r--r-- | epan/dissectors/packet-cmp.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 4c88ef087d..c22ae6dbc0 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1721,7 +1721,7 @@ void proto_register_cmp(void) { { &hf_cmp_tcptrans_next_poll_ref, { "Next Polling Reference", "cmp.tcptrans.next_poll_ref", FT_UINT32, BASE_HEX, NULL, 0, - "TCP transport Next Polling Reference ", HFILL }}, + "TCP transport Next Polling Reference", HFILL }}, { &hf_cmp_tcptrans_ttcb, { "Time to check Back", "cmp.tcptrans.ttcb", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, @@ -1815,7 +1815,7 @@ void proto_register_cmp(void) { "cmp.PKIBody", HFILL }}, { &hf_cmp_protection, { "protection", "cmp.protection", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.PKIProtection", HFILL }}, { &hf_cmp_extraCerts, { "extraCerts", "cmp.extraCerts", @@ -1851,23 +1851,23 @@ void proto_register_cmp(void) { "pkix1explicit.AlgorithmIdentifier", HFILL }}, { &hf_cmp_senderKID, { "senderKID", "cmp.senderKID", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkix1implicit.KeyIdentifier", HFILL }}, { &hf_cmp_recipKID, { "recipKID", "cmp.recipKID", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "pkix1implicit.KeyIdentifier", HFILL }}, { &hf_cmp_transactionID, { "transactionID", "cmp.transactionID", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_senderNonce, { "senderNonce", "cmp.senderNonce", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_recipNonce, { "recipNonce", "cmp.recipNonce", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_freeText, { "freeText", "cmp.freeText", @@ -1995,7 +1995,7 @@ void proto_register_cmp(void) { "cmp.PollRepContent", HFILL }}, { &hf_cmp_salt, { "salt", "cmp.salt", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_owf, { "owf", "cmp.owf", @@ -2019,7 +2019,7 @@ void proto_register_cmp(void) { "cmp.PKIFreeText", HFILL }}, { &hf_cmp_failInfo, { "failInfo", "cmp.failInfo", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.PKIFailureInfo", HFILL }}, { &hf_cmp_hashAlg, { "hashAlg", "cmp.hashAlg", @@ -2031,7 +2031,7 @@ void proto_register_cmp(void) { "crmf.CertId", HFILL }}, { &hf_cmp_hashVal, { "hashVal", "cmp.hashVal", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.BIT_STRING", HFILL }}, { &hf_cmp_POPODecKeyChallContent_item, { "Challenge", "cmp.Challenge", @@ -2039,11 +2039,11 @@ void proto_register_cmp(void) { "cmp.Challenge", HFILL }}, { &hf_cmp_witness, { "witness", "cmp.witness", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_challenge, { "challenge", "cmp.challenge", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_POPODecKeyRespContent_item, { "POPODecKeyRespContent item", "cmp.POPODecKeyRespContent_item", @@ -2079,7 +2079,7 @@ void proto_register_cmp(void) { "cmp.CertifiedKeyPair", HFILL }}, { &hf_cmp_rspInfo, { "rspInfo", "cmp.rspInfo", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_certOrEncCert, { "certOrEncCert", "cmp.certOrEncCert", @@ -2191,7 +2191,7 @@ void proto_register_cmp(void) { "cmp.CertStatus", HFILL }}, { &hf_cmp_certHash, { "certHash", "cmp.certHash", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_statusInfo, { "statusInfo", "cmp.statusInfo", @@ -2260,111 +2260,111 @@ void proto_register_cmp(void) { { &hf_cmp_PKIFailureInfo_badAlg, { "badAlg", "cmp.badAlg", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badMessageCheck, { "badMessageCheck", "cmp.badMessageCheck", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badRequest, { "badRequest", "cmp.badRequest", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badTime, { "badTime", "cmp.badTime", FT_BOOLEAN, 8, NULL, 0x10, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badCertId, { "badCertId", "cmp.badCertId", FT_BOOLEAN, 8, NULL, 0x08, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badDataFormat, { "badDataFormat", "cmp.badDataFormat", FT_BOOLEAN, 8, NULL, 0x04, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_wrongAuthority, { "wrongAuthority", "cmp.wrongAuthority", FT_BOOLEAN, 8, NULL, 0x02, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_incorrectData, { "incorrectData", "cmp.incorrectData", FT_BOOLEAN, 8, NULL, 0x01, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_missingTimeStamp, { "missingTimeStamp", "cmp.missingTimeStamp", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badPOP, { "badPOP", "cmp.badPOP", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_certRevoked, { "certRevoked", "cmp.certRevoked", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_certConfirmed, { "certConfirmed", "cmp.certConfirmed", FT_BOOLEAN, 8, NULL, 0x10, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_wrongIntegrity, { "wrongIntegrity", "cmp.wrongIntegrity", FT_BOOLEAN, 8, NULL, 0x08, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badRecipientNonce, { "badRecipientNonce", "cmp.badRecipientNonce", FT_BOOLEAN, 8, NULL, 0x04, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_timeNotAvailable, { "timeNotAvailable", "cmp.timeNotAvailable", FT_BOOLEAN, 8, NULL, 0x02, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_unacceptedPolicy, { "unacceptedPolicy", "cmp.unacceptedPolicy", FT_BOOLEAN, 8, NULL, 0x01, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_unacceptedExtension, { "unacceptedExtension", "cmp.unacceptedExtension", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_addInfoNotAvailable, { "addInfoNotAvailable", "cmp.addInfoNotAvailable", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badSenderNonce, { "badSenderNonce", "cmp.badSenderNonce", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_badCertTemplate, { "badCertTemplate", "cmp.badCertTemplate", FT_BOOLEAN, 8, NULL, 0x10, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_signerNotTrusted, { "signerNotTrusted", "cmp.signerNotTrusted", FT_BOOLEAN, 8, NULL, 0x08, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_transactionIdInUse, { "transactionIdInUse", "cmp.transactionIdInUse", FT_BOOLEAN, 8, NULL, 0x04, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_unsupportedVersion, { "unsupportedVersion", "cmp.unsupportedVersion", FT_BOOLEAN, 8, NULL, 0x02, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_notAuthorized, { "notAuthorized", "cmp.notAuthorized", FT_BOOLEAN, 8, NULL, 0x01, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_systemUnavail, { "systemUnavail", "cmp.systemUnavail", FT_BOOLEAN, 8, NULL, 0x80, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_systemFailure, { "systemFailure", "cmp.systemFailure", FT_BOOLEAN, 8, NULL, 0x40, - "", HFILL }}, + NULL, HFILL }}, { &hf_cmp_PKIFailureInfo_duplicateCertReq, { "duplicateCertReq", "cmp.duplicateCertReq", FT_BOOLEAN, 8, NULL, 0x20, - "", HFILL }}, + NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ #line 352 "packet-cmp-template.c" |