ssh: remove uninformative blurbs

For most of the fields, the blurb is just the name with "SSH" prepended,
which is not particularly useful. Replace a few of them with more
informative descriptions and remove the rest.

Change-Id: I15e95a42e897d09d3b6334022b32dd36f29e86a4
Reviewed-on: https://code.wireshark.org/review/19198
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 45 insertions, 45 deletions

diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index d22f276dbc..92a6693807 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -1220,177 +1220,177 @@ proto_register_ssh(void)
         { &hf_ssh_protocol,
           { "Protocol",  "ssh.protocol",
             FT_STRING, BASE_NONE, NULL, 0x0,
-            "SSH Protocol", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_packet_length,
           { "Packet Length",      "ssh.packet_length",
             FT_UINT32, BASE_DEC, NULL,  0x0,
-            "SSH packet length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_packet_length_encrypted,
           { "Packet Length (encrypted)",      "ssh.packet_length_encrypted",
             FT_BYTES, BASE_NONE, NULL,  0x0,
-            "SSH packet length (encrypted)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_padding_length,
           { "Padding Length",  "ssh.padding_length",
             FT_UINT8, BASE_DEC, NULL, 0x0,
-            "SSH Packet Number", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_payload,
           { "Payload",  "ssh.payload",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH Payload", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_encrypted_packet,
           { "Encrypted Packet",  "ssh.encrypted_packet",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH Protocol Packet", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_padding_string,
           { "Padding String",  "ssh.padding_string",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH Padding String", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mac_string,
           { "MAC",  "ssh.mac",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH Protocol Packet MAC", HFILL }},
+            "Message authentication code", HFILL }},
 
         { &hf_ssh_msg_code,
           { "Message Code",  "ssh.message_code",
             FT_UINT8, BASE_DEC, VALS(ssh1_msg_vals), 0x0,
-            "SSH Message Code", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh2_msg_code,
           { "Message Code",  "ssh.message_code",
             FT_UINT8, BASE_DEC, VALS(ssh2_msg_vals), 0x0,
-            "SSH Message Code", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh2_kex_dh_msg_code,
           { "Message Code",  "ssh.message_code",
             FT_UINT8, BASE_DEC, VALS(ssh2_kex_dh_msg_vals), 0x0,
-            "SSH Message Code", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh2_kex_dh_gex_msg_code,
           { "Message Code",  "ssh.message_code",
             FT_UINT8, BASE_DEC, VALS(ssh2_kex_dh_gex_msg_vals), 0x0,
-            "SSH Message Code", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_cookie,
           { "Cookie",  "ssh.cookie",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH Cookie", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_kex_algorithms,
           { "kex_algorithms string",         "ssh.kex_algorithms",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH kex_algorithms string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_server_host_key_algorithms,
           { "server_host_key_algorithms string",         "ssh.server_host_key_algorithms",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH server_host_key_algorithms string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_encryption_algorithms_client_to_server,
           { "encryption_algorithms_client_to_server string",         "ssh.encryption_algorithms_client_to_server",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH encryption_algorithms_client_to_server string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_encryption_algorithms_server_to_client,
           { "encryption_algorithms_server_to_client string",         "ssh.encryption_algorithms_server_to_client",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH encryption_algorithms_server_to_client string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mac_algorithms_client_to_server,
           { "mac_algorithms_client_to_server string",         "ssh.mac_algorithms_client_to_server",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH mac_algorithms_client_to_server string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mac_algorithms_server_to_client,
           { "mac_algorithms_server_to_client string",         "ssh.mac_algorithms_server_to_client",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH mac_algorithms_server_to_client string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_compression_algorithms_client_to_server,
           { "compression_algorithms_client_to_server string",         "ssh.compression_algorithms_client_to_server",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH compression_algorithms_client_to_server string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_compression_algorithms_server_to_client,
           { "compression_algorithms_server_to_client string",         "ssh.compression_algorithms_server_to_client",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH compression_algorithms_server_to_client string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_languages_client_to_server,
           { "languages_client_to_server string",         "ssh.languages_client_to_server",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH languages_client_to_server string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_languages_server_to_client,
           { "languages_server_to_client string",         "ssh.languages_server_to_client",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
-            "SSH languages_server_to_client string", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_kex_algorithms_length,
           { "kex_algorithms length",         "ssh.kex_algorithms_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH kex_algorithms length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_server_host_key_algorithms_length,
           { "server_host_key_algorithms length",         "ssh.server_host_key_algorithms_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH server_host_key_algorithms length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_encryption_algorithms_client_to_server_length,
           { "encryption_algorithms_client_to_server length",         "ssh.encryption_algorithms_client_to_server_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH encryption_algorithms_client_to_server length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_encryption_algorithms_server_to_client_length,
           { "encryption_algorithms_server_to_client length",         "ssh.encryption_algorithms_server_to_client_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH encryption_algorithms_server_to_client length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mac_algorithms_client_to_server_length,
           { "mac_algorithms_client_to_server length",         "ssh.mac_algorithms_client_to_server_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH mac_algorithms_client_to_server length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mac_algorithms_server_to_client_length,
           { "mac_algorithms_server_to_client length",         "ssh.mac_algorithms_server_to_client_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH mac_algorithms_server_to_client length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_compression_algorithms_client_to_server_length,
           { "compression_algorithms_client_to_server length",         "ssh.compression_algorithms_client_to_server_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH compression_algorithms_client_to_server length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_compression_algorithms_server_to_client_length,
           { "compression_algorithms_server_to_client length",         "ssh.compression_algorithms_server_to_client_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH compression_algorithms_server_to_client length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_languages_client_to_server_length,
           { "languages_client_to_server length",         "ssh.languages_client_to_server_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH languages_client_to_server length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_languages_server_to_client_length,
           { "languages_server_to_client length",         "ssh.languages_server_to_client_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH languages_server_to_client length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_kex_first_packet_follows,
           { "KEX First Packet Follows",      "ssh.kex.first_packet_follows",
             FT_UINT8, BASE_DEC, NULL, 0x0,
-            "SSH KEX Fist Packet Follows", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_kex_reserved,
           { "Reserved",  "ssh.kex.reserved",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH Protocol KEX Reserved", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_hostkey_length,
           { "Host key length",         "ssh.host_key.length",
@@ -1460,52 +1460,52 @@ proto_register_ssh(void)
         { &hf_ssh_kexdh_h_sig,
           { "KEX DH H signature",         "ssh.kexdh.h_sig",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH KEX DH H signature", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_kexdh_h_sig_length,
           { "KEX DH H signature length",         "ssh.kexdh.h_sig_length",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH KEX DH H signature length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mpint_e,
           { "DH client e",  "ssh.dh.e",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH DH client e", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mpint_f,
           { "DH server f",  "ssh.dh.f",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH DH server f", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_dh_gex_min,
           { "DH GEX Min",  "ssh.dh_gex.min",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH DH GEX Minimum", HFILL }},
+            "Minimal acceptable group size", HFILL }},
 
         { &hf_ssh_dh_gex_nbits,
           { "DH GEX Number of Bits",  "ssh.dh_gex.nbits",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH DH GEX Number of Bits", HFILL }},
+            "Preferred group size", HFILL }},
 
         { &hf_ssh_dh_gex_max,
           { "DH GEX Max",  "ssh.dh_gex.max",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "SSH DH GEX Maximum", HFILL }},
+            "Maximal acceptable group size", HFILL }},
 
         { &hf_ssh_mpint_p,
           { "DH modulus (P)",  "ssh.dh.p",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH DH modulus (P)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mpint_g,
           { "DH base (G)",  "ssh.dh.g",
             FT_BYTES, BASE_NONE, NULL, 0x0,
-            "SSH DH base (G)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ssh_mpint_length,
           { "Multi Precision Integer Length",      "ssh.mpint_length",
             FT_UINT32, BASE_DEC, NULL,  0x0,
-            "SSH mpint length", HFILL }},
+            NULL, HFILL }},
     };
 
     static gint *ett[] = {