Make it clearer which protocol version various bugs apply to.

[originally from svn r5490]

diff --git a/config.c b/config.c
index 9535397819f63bb0f7b408d681e6b8e143851e07..0f71201987d42fb0e55a278478d451ae0f949e0e 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1842,10 +1842,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
            ctrl_droplist(s, "Requires padding on SSH-2 RSA signatures", 'p', 20,
                          HELPCTX(ssh_bugs_rsapad2),
                          sshbug_handler, I(offsetof(Config,sshbug_rsapad2)));
-           ctrl_droplist(s, "Misuses the session ID in PK auth", 'n', 20,
+           ctrl_droplist(s, "Misuses the session ID in SSH-2 PK auth", 'n', 20,
                          HELPCTX(ssh_bugs_pksessid2),
                          sshbug_handler, I(offsetof(Config,sshbug_pksessid2)));
-           ctrl_droplist(s, "Handles key re-exchange badly", 'k', 20,
+           ctrl_droplist(s, "Handles SSH-2 key re-exchange badly", 'k', 20,
                          HELPCTX(ssh_bugs_rekey2),
                          sshbug_handler, I(offsetof(Config,sshbug_rekey2)));
        }

diff --git a/doc/config.but b/doc/config.but
index 157deaf93a43cc240fc7b62ddbf93021151529dd..0b5068987719babba767ea479eac4032272d0552 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -2670,7 +2670,7 @@ to talking to OpenSSH.
 
 This is an SSH-2-specific bug.
 
-\S{config-ssh-bug-pksessid2} \q{Misuses the session ID in PK auth}
+\S{config-ssh-bug-pksessid2} \q{Misuses the session ID in SSH-2 PK auth}
 
 \cfg{winhelp-topic}{ssh.bugs.pksessid2}
 
@@ -2688,7 +2688,7 @@ SSH-2 public-key authentication will fail.
 
 This is an SSH-2-specific bug.
 
-\S{config-ssh-bug-rekey} \q{Handles key re-exchange badly}
+\S{config-ssh-bug-rekey} \q{Handles SSH-2 key re-exchange badly}
 
 \cfg{winhelp-topic}{ssh.bugs.rekey2}
 

diff --git a/ssh.c b/ssh.c
index 41ef92faedb7224992b98ae372a6cda1c2a21ac0..828b1ce8ef8f9d0ba8e9924cf8fefd6956839db3 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -2112,7 +2112,7 @@ static void ssh_detect_bugs(Ssh ssh, char *vstring)
         * an AUTH_RSA message.
         */
        ssh->remote_bugs |= BUG_CHOKES_ON_RSA;
-       logevent("We believe remote version can't handle RSA authentication");
+       logevent("We believe remote version can't handle SSH-1 RSA authentication");
     }
 
     if (ssh->cfg.sshbug_hmac2 == FORCE_ON ||