aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2006-12-25 04:01:22 +0000
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2006-12-25 04:01:22 +0000
commite7849e6dbb329ff0aabd9d01c2ff828d80929e6a (patch)
tree4447808d0ad196d4c64bec0395a8a6af33587a99
parent358b36654f91a588f2b7fc6ddebc69032e76cc08 (diff)
From Sake Blok:
The attached patch changes the way the ssl-session-id is displayed. Currently it is not shown, only the length is shown like this: Session ID Length: 32 Session ID (32 bytes) To me, it is not useful to repeat the length and omit the ID itself. With this patch the ssl-session-id is shown like this: Session ID Length: 32 Session ID: A4B2FB0EE6D8F58DEFF68E38B1E5B4C25F1869D4BC86A96E... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20212 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--AUTHORS1
-rw-r--r--epan/dissectors/packet-ssl.c7
2 files changed, 3 insertions, 5 deletions
diff --git a/AUTHORS b/AUTHORS
index 0e7b087564..6033aee898 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2687,6 +2687,7 @@ Joe Breher <linux [AT] q-music.com>
Patrick vd Lageweg <patrick [AT] bitwizard.nl>
Thomas Sillaber <Thomas.Sillaber [AT] gmx.de>
Sebastien Tandel <sebastien [AT] tandel.be>
+Sake Blok <sake [AT] euronet.nl>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 64ceb569a2..2a37c03640 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -1589,12 +1589,9 @@ dissect_ssl3_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree,
if (session_id_length > 0)
{
tvb_ensure_bytes_exist(tvb, offset, session_id_length);
- proto_tree_add_bytes_format(tree, hf_ssl_handshake_session_id,
+ proto_tree_add_bytes(tree, hf_ssl_handshake_session_id,
tvb, offset, session_id_length,
- tvb_get_ptr(tvb, offset, session_id_length),
- "Session ID (%u byte%s)",
- session_id_length,
- plurality(session_id_length, "", "s"));
+ tvb_get_ptr(tvb, offset, session_id_length));
offset += session_id_length;
}