diff options
author | Stefan Metzmacher <metze@samba.org> | 2017-11-02 08:45:18 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2020-01-26 19:31:34 +0000 |
commit | 17a6916a21b2fd935191856aee07467dc4682167 (patch) | |
tree | e393b3981f9c99114c640afb373c354da078609d | |
parent | 82ed8918ab25f45254092e32e12d12234ab6d939 (diff) |
epan/to_str: change MAX_BYTE_STR_LEN from 48 to 72
We want things like aes-256 keys to be displayed completely.
Change-Id: I746f3282440c036cfb60263be40e3b3a6ed859c2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/35703
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/to_str.c | 2 | ||||
-rw-r--r-- | test/suite_sharkd.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/to_str.c b/epan/to_str.c index fd37f8c6bb..61d008fa09 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -171,7 +171,7 @@ bytes_to_hexstr_punct(char *out, const guint8 *ad, guint32 len, char punct) } /* Max string length for displaying byte string. */ -#define MAX_BYTE_STR_LEN 48 +#define MAX_BYTE_STR_LEN 72 /* Routine to convert a sequence of bytes to a hex string, one byte/two hex * digits at at a time, with a specified punctuation character between diff --git a/test/suite_sharkd.py b/test/suite_sharkd.py index a494ba3ff3..612bcb4e61 100644 --- a/test/suite_sharkd.py +++ b/test/suite_sharkd.py @@ -338,7 +338,7 @@ class case_sharkd(subprocesstest.SubprocessTestCase): "f": "dhcp", "e": MatchAny(int), "n": MatchList({ - "l": "Padding: 000000000000000000000000000000000000000000000000…", + "l": "Padding: 0000000000000000000000000000000000000000000000000000", "h": [316, 26], "f": "dhcp.option.padding == 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00" }, match_element=any), # match one element from 'n' |