aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ber.c8
-rw-r--r--epan/dissectors/packet-x509af.c6
2 files changed, 9 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index eeff690f73..9f286c39c6 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -1892,8 +1892,12 @@ printf("INTEGERnew dissect_ber_integer(%s) entered implicit_tag:%d \n", name, im
if (hf_id >= 0) {
header_field_info *hfinfo = proto_registrar_get_nth(hf_id);
- proto_tree_add_bytes_format(tree, hf_ber_64bit_uint_as_bytes, tvb, offset, len, NULL,
- "%s : 0x%s", hfinfo->name, tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, len));
+ /* use the original field only if it is suitable for bytes */
+ if (hfinfo->type != FT_BYTES)
+ hf_id = hf_ber_64bit_uint_as_bytes;
+
+ proto_tree_add_bytes_format(tree, hf_id, tvb, offset, len, NULL,
+ "%s: 0x%s", hfinfo->name, tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, len));
}
offset += len;
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index e3cabe6295..3e261ae79e 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -1222,15 +1222,15 @@ void proto_register_x509af(void) {
NULL, HFILL }},
{ &hf_x509af_p,
{ "p", "x509af.p",
- FT_INT32, BASE_DEC, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"INTEGER", HFILL }},
{ &hf_x509af_q,
{ "q", "x509af.q",
- FT_INT32, BASE_DEC, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"INTEGER", HFILL }},
{ &hf_x509af_g,
{ "g", "x509af.g",
- FT_INT32, BASE_DEC, NULL, 0,
+ FT_BYTES, BASE_NONE, NULL, 0,
"INTEGER", HFILL }},
/*--- End of included file: packet-x509af-hfarr.c ---*/