first pass

[PuTTY.git] / config.c

diff --git a/config.c b/config.c
index b32cfae5b3566e3df38e7ccf57920d857c2241cc..59d01e7479cded42d6e0384b7f1bac8b6c306d85 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1690,6 +1690,10 @@ void setup_config_box(struct controlbox *b, int midsession,
                  HELPCTX(features_retitle),
                  conf_checkbox_handler,
                  I(CONF_no_remote_wintitle));
+    ctrl_checkbox(s, "Disable remote-controlled clearing of scrollback", 'e',
+                 HELPCTX(features_clearscroll),
+                 conf_checkbox_handler,
+                 I(CONF_no_remote_clearscroll));
     ctrl_radiobuttons(s, "Response to remote title query (SECURITY):", 'q', 3,
                      HELPCTX(features_qtitle),
                      conf_radiobutton_handler,
@@ -2118,7 +2122,7 @@ void setup_config_box(struct controlbox *b, int midsession,
 
        ctrl_radiobuttons(s, "Print proxy diagnostics "
                           "in the terminal window", 'r', 5,
-                         HELPCTX(proxy_main),
+                         HELPCTX(proxy_logging),
                          conf_radiobutton_handler,
                          I(CONF_proxy_log_to_term),
                          "No", I(FORCE_OFF),
@@ -2248,14 +2252,12 @@ void setup_config_box(struct controlbox *b, int midsession,
        if (!midsession) {
            s = ctrl_getset(b, "Connection/SSH", "protocol", "Protocol options");
 
-           ctrl_radiobuttons(s, "Preferred SSH protocol version:", NO_SHORTCUT, 4,
+           ctrl_radiobuttons(s, "SSH protocol version:", NO_SHORTCUT, 2,
                              HELPCTX(ssh_protocol),
                              conf_radiobutton_handler,
                              I(CONF_sshprot),
-                             "1 only", 'l', I(0),
-                             "1", '1', I(1),
-                             "2", '2', I(2),
-                             "2 only", 'y', I(3), NULL);
+                             "2", '2', I(3),
+                             "1 (INSECURE)", '1', I(0), NULL);
        }
 
        /*
@@ -2642,27 +2644,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");
@@ -2672,21 +2668,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));
        }
     }
 }