diff options
| author | Роман Донченко <dpb@corrigendum.ru> | 2016-12-03 02:49:37 +0300 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-12-03 21:35:30 +0000 |
| commit | a0d03ce1e70144fe713df9e03b30bc8126d764a5 (patch) | |
| tree | 37f2e175feb906158bc2f62e96ced8d8269778c9 | |
| parent | a0b4d4657849811b78a36ac0a6449ea0f4c552a1 (diff) | |
ssh: dissect the host key when the connection uses DH group exchange
After this, hf_ssh_kexdh_host_key is no longer used, so remove it.
Change-Id: Ie56a086481bbe087b7ba3b17aea394c05986f63d
Reviewed-on: https://code.wireshark.org/review/19052
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-ssh.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 5cbd1548ec..acb077cfe3 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -139,7 +139,6 @@ static int hf_ssh_mpint_p= -1; static int hf_ssh_mpint_e= -1; static int hf_ssh_mpint_f= -1; static int hf_ssh_mpint_length= -1; -static int hf_ssh_kexdh_host_key= -1; static int hf_ssh_hostkey_length= -1; static int hf_ssh_hostkey_type= -1; static int hf_ssh_hostkey_data= -1; @@ -863,7 +862,7 @@ static int ssh_dissect_kex_dh_gex(guint8 msg_code, tvbuff_t *tvb, break; case SSH_MSG_KEX_DH_GEX_REPLY: - offset += ssh_tree_add_string(tvb, offset, tree, hf_ssh_kexdh_host_key, hf_ssh_hostkey_length); + offset += ssh_tree_add_hostkey(tvb, offset, tree, "KEX DH host key", ett_key_exchange_host_key); offset += ssh_tree_add_mpint(tvb, offset, tree, hf_ssh_mpint_f); offset += ssh_tree_add_string(tvb, offset, tree, hf_ssh_kexdh_h_sig, hf_ssh_kexdh_h_sig_length); break; @@ -1254,11 +1253,6 @@ proto_register_ssh(void) FT_UINT32, BASE_DEC, NULL, 0x0, "SSH mpint length", HFILL }}, - { &hf_ssh_kexdh_host_key, - { "KEX DH host key", "ssh.kexdh.host_key", - FT_BYTES, BASE_NONE, NULL, 0x0, - "SSH KEX DH host key", HFILL }}, - { &hf_ssh_kexdh_h_sig, { "KEX DH H signature", "ssh.kexdh.h_sig", FT_BYTES, BASE_NONE, NULL, 0x0, |