Reorganise the Bugs and More Bugs config panels.

Now bugs that are still likely to come up with relatively recent
server software (because they're only a few years fixed, or because
they're the sort of mistake that new server implementors will likely
make again) are in the Bugs panel, and very old things long since
fixed are relegated to More Bugs.

In particular, More Bugs contains everything SSH-1 related.

diff --git a/config.c b/config.c
index 328f39e8a8450dbfbc3ef69ff589a448ab1fea47..1b4bd91e240d3e25e77c9007e8c5cac2ae953e1e 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2640,27 +2640,21 @@ void setup_config_box(struct controlbox *b, int midsession,
 
            s = ctrl_getset(b, "Connection/SSH/Bugs", "main",
                            "Detection of known bugs in SSH servers");
-           ctrl_droplist(s, "Chokes on SSH-1 ignore messages", 'i', 20,
-                         HELPCTX(ssh_bugs_ignore1),
-                         sshbug_handler, I(CONF_sshbug_ignore1));
-           ctrl_droplist(s, "Refuses all SSH-1 password camouflage", 's', 20,
-                         HELPCTX(ssh_bugs_plainpw1),
-                         sshbug_handler, I(CONF_sshbug_plainpw1));
-           ctrl_droplist(s, "Chokes on SSH-1 RSA authentication", 'r', 20,
-                         HELPCTX(ssh_bugs_rsa1),
-                         sshbug_handler, I(CONF_sshbug_rsa1));
            ctrl_droplist(s, "Chokes on SSH-2 ignore messages", '2', 20,
                          HELPCTX(ssh_bugs_ignore2),
                          sshbug_handler, I(CONF_sshbug_ignore2));
+           ctrl_droplist(s, "Handles SSH-2 key re-exchange badly", 'k', 20,
+                         HELPCTX(ssh_bugs_rekey2),
+                         sshbug_handler, I(CONF_sshbug_rekey2));
            ctrl_droplist(s, "Chokes on PuTTY's SSH-2 'winadj' requests", 'j',
                           20, HELPCTX(ssh_bugs_winadj),
                          sshbug_handler, I(CONF_sshbug_winadj));
-           ctrl_droplist(s, "Miscomputes SSH-2 HMAC keys", 'm', 20,
-                         HELPCTX(ssh_bugs_hmac2),
-                         sshbug_handler, I(CONF_sshbug_hmac2));
-           ctrl_droplist(s, "Miscomputes SSH-2 encryption keys", 'e', 20,
-                         HELPCTX(ssh_bugs_derivekey2),
-                         sshbug_handler, I(CONF_sshbug_derivekey2));
+           ctrl_droplist(s, "Replies to requests on closed channels", 'q', 20,
+                         HELPCTX(ssh_bugs_chanreq),
+                         sshbug_handler, I(CONF_sshbug_chanreq));
+           ctrl_droplist(s, "Ignores SSH-2 maximum packet size", 'x', 20,
+                         HELPCTX(ssh_bugs_maxpkt2),
+                         sshbug_handler, I(CONF_sshbug_maxpkt2));
 
            ctrl_settitle(b, "Connection/SSH/More bugs",
                          "Further workarounds for SSH server bugs");
@@ -2670,21 +2664,27 @@ void setup_config_box(struct controlbox *b, int midsession,
            ctrl_droplist(s, "Requires padding on SSH-2 RSA signatures", 'p', 20,
                          HELPCTX(ssh_bugs_rsapad2),
                          sshbug_handler, I(CONF_sshbug_rsapad2));
-           ctrl_droplist(s, "Misuses the session ID in SSH-2 PK auth", 'n', 20,
-                         HELPCTX(ssh_bugs_pksessid2),
-                         sshbug_handler, I(CONF_sshbug_pksessid2));
-           ctrl_droplist(s, "Handles SSH-2 key re-exchange badly", 'k', 20,
-                         HELPCTX(ssh_bugs_rekey2),
-                         sshbug_handler, I(CONF_sshbug_rekey2));
-           ctrl_droplist(s, "Ignores SSH-2 maximum packet size", 'x', 20,
-                         HELPCTX(ssh_bugs_maxpkt2),
-                         sshbug_handler, I(CONF_sshbug_maxpkt2));
            ctrl_droplist(s, "Only supports pre-RFC4419 SSH-2 DH GEX", 'd', 20,
                          HELPCTX(ssh_bugs_oldgex2),
                          sshbug_handler, I(CONF_sshbug_oldgex2));
-           ctrl_droplist(s, "Replies to requests on closed channels", 'q', 20,
-                         HELPCTX(ssh_bugs_chanreq),
-                         sshbug_handler, I(CONF_sshbug_chanreq));
+           ctrl_droplist(s, "Miscomputes SSH-2 HMAC keys", 'm', 20,
+                         HELPCTX(ssh_bugs_hmac2),
+                         sshbug_handler, I(CONF_sshbug_hmac2));
+           ctrl_droplist(s, "Misuses the session ID in SSH-2 PK auth", 'n', 20,
+                         HELPCTX(ssh_bugs_pksessid2),
+                         sshbug_handler, I(CONF_sshbug_pksessid2));
+           ctrl_droplist(s, "Miscomputes SSH-2 encryption keys", 'e', 20,
+                         HELPCTX(ssh_bugs_derivekey2),
+                         sshbug_handler, I(CONF_sshbug_derivekey2));
+           ctrl_droplist(s, "Chokes on SSH-1 ignore messages", 'i', 20,
+                         HELPCTX(ssh_bugs_ignore1),
+                         sshbug_handler, I(CONF_sshbug_ignore1));
+           ctrl_droplist(s, "Refuses all SSH-1 password camouflage", 's', 20,
+                         HELPCTX(ssh_bugs_plainpw1),
+                         sshbug_handler, I(CONF_sshbug_plainpw1));
+           ctrl_droplist(s, "Chokes on SSH-1 RSA authentication", 'r', 20,
+                         HELPCTX(ssh_bugs_rsa1),
+                         sshbug_handler, I(CONF_sshbug_rsa1));
        }
     }
 }