osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8977 : 

In SSH, the protocol version message is terminated by CR LF. Wireshark, in the
info column, strips out the LF, but not the CR.

Attaching a patch to rectify that.

Also, as requested, update the contributor's email address in AUTHORS.

svn path=/trunk/; revision=50902
This commit is contained in:
Jeff Morriss 2013-07-26 01:35:44 +00:00
parent 26197c1693
commit 588bc03a5b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -3712,7 +3712,7 @@ Paul Stath <pstath[AT]axxcelera.com>
DeCount <aatrade[AT]libero.it>
Andras Veres-Szentkiralyi <vsza[AT]vsza.hu>
Jakob Hirsch <jh.wireshark-bugzilla[AT]plonk.de>
Роман Донченко <DXDragon[AT]yandex.ru>
Роман Донченко <dpb[AT]corrigendum.ru>
<billyjeans[AT]gmail.com>
Evan Huus <eapache[AT]gmail.com>
Tom Cook <tcook[AT]ixiacom.com>

16
epan/dissectors/packet-ssh.c
View File

@ -57,11 +57,11 @@
#include <epan/expert.h>
/* SSH Version 1 definition , from openssh ssh1.h */
#define SSH1_MSG_NONE 0 /* no message */
#define SSH1_MSG_DISCONNECT 1 /* cause (string) */
#define SSH1_MSG_NONE 0 /* no message */
#define SSH1_MSG_DISCONNECT 1 /* cause (string) */
#define SSH1_SMSG_PUBLIC_KEY 2 /* ck,msk,srvk,hostk */
#define SSH1_CMSG_SESSION_KEY 3 /* key (BIGNUM) */
#define SSH1_CMSG_USER 4 /* user (string) */
#define SSH1_CMSG_USER 4 /* user (string) */
#define SSH_VERSION_UNKNOWN 0
@ -283,7 +283,7 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
conversation_t *conversation;
int last_offset, offset = 0;
gboolean is_response = (pinfo->destport != pinfo->match_uint),
gboolean is_response = (pinfo->destport != pinfo->match_uint),
need_desegmentation;
guint version;
@ -412,7 +412,7 @@ ssh_dissect_ssh2(tvbuff_t *tvb, packet_info *pinfo,
}
if ((global_data->frame_key_start == 0) ||
((global_data->frame_key_start <= pinfo->fd->num) &&
((global_data->frame_key_start <= pinfo->fd->num) &&
((global_data->frame_key_end == 0) || (pinfo->fd->num <= global_data->frame_key_end)))) {
offset = ssh_dissect_key_exchange(tvb,pinfo, global_data,
offset,ssh2_tree,is_response,
@ -804,7 +804,11 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo,
protolen = linelen;
} else {
linelen = linelen - offset + 1;
protolen = linelen - 1;
if (linelen > 1 && tvb_get_guint8(tvb, offset + linelen - 2) == '\r')
protolen = linelen - 2;
else
protolen = linelen - 1;
}
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Protocol: %s",