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-ocsp.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-ocsp.c')
| -rw-r--r-- | epan/dissectors/packet-ocsp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 45c628ddc0..5b9c901531 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -714,7 +714,7 @@ void proto_register_ocsp(void) { { &hf_ocsp_responseType_id, { "ResponseType Id", "x509af.responseType.id", FT_STRING, BASE_NONE, NULL, 0, - "ResponseType Id", HFILL }}, + NULL, HFILL }}, /*--- Included file: packet-ocsp-hfarr.c ---*/ #line 1 "packet-ocsp-hfarr.c" @@ -776,7 +776,7 @@ void proto_register_ocsp(void) { "x509af.AlgorithmIdentifier", HFILL }}, { &hf_ocsp_signature, { "signature", "ocsp.signature", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ocsp.BIT_STRING", HFILL }}, { &hf_ocsp_certs, { "certs", "ocsp.certs", @@ -800,11 +800,11 @@ void proto_register_ocsp(void) { "x509af.AlgorithmIdentifier", HFILL }}, { &hf_ocsp_issuerNameHash, { "issuerNameHash", "ocsp.issuerNameHash", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ocsp.OCTET_STRING", HFILL }}, { &hf_ocsp_issuerKeyHash, { "issuerKeyHash", "ocsp.issuerKeyHash", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ocsp.OCTET_STRING", HFILL }}, { &hf_ocsp_serialNumber, { "serialNumber", "ocsp.serialNumber", @@ -824,7 +824,7 @@ void proto_register_ocsp(void) { "ocsp.T_responseType", HFILL }}, { &hf_ocsp_response, { "response", "ocsp.response", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ocsp.T_response", HFILL }}, { &hf_ocsp_tbsResponseData, { "tbsResponseData", "ocsp.tbsResponseData", @@ -856,7 +856,7 @@ void proto_register_ocsp(void) { "pkix1explicit.Name", HFILL }}, { &hf_ocsp_byKey, { "byKey", "ocsp.byKey", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "ocsp.KeyHash", HFILL }}, { &hf_ocsp_certID, { "certID", "ocsp.certID", |