From 51ee4eb144e59e5f7f2c6dbeb921a48cb4863e2e Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 25 Apr 2015 10:46:56 +0100 Subject: [PATCH] Divide the Bugs panel in half. It overflowed as a result of the previous commit. (cherry picked from commit 84e239dd88245cd3308de987b2b0fd6637b2db34) --- config.c | 8 +++++++- doc/config.but | 9 +++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config.c b/config.c index 395f9c81..0ad55413 100644 --- a/config.c +++ b/config.c @@ -2563,7 +2563,7 @@ void setup_config_box(struct controlbox *b, int midsession, if (!midsession) { /* - * The Connection/SSH/Bugs panel. + * The Connection/SSH/Bugs panels. */ ctrl_settitle(b, "Connection/SSH/Bugs", "Workarounds for SSH server bugs"); @@ -2591,6 +2591,12 @@ void setup_config_box(struct controlbox *b, int midsession, ctrl_droplist(s, "Miscomputes SSH-2 encryption keys", 'e', 20, HELPCTX(ssh_bugs_derivekey2), sshbug_handler, I(CONF_sshbug_derivekey2)); + + ctrl_settitle(b, "Connection/SSH/More bugs", + "Further workarounds for SSH server bugs"); + + s = ctrl_getset(b, "Connection/SSH/More bugs", "main", + "Detection of known bugs in SSH servers"); ctrl_droplist(s, "Requires padding on SSH-2 RSA signatures", 'p', 20, HELPCTX(ssh_bugs_rsapad2), sshbug_handler, I(CONF_sshbug_rsapad2)); diff --git a/doc/config.but b/doc/config.but index 1d81460f..c23f4ddb 100644 --- a/doc/config.but +++ b/doc/config.but @@ -3128,7 +3128,7 @@ you do the same on Linux, you can also use it with IPv4. However, ticking \q{Auto} should always give you a port which you can connect to using either protocol. -\H{config-ssh-bugs} \I{SSH server bugs}The Bugs panel +\H{config-ssh-bugs} \I{SSH server bugs}The Bugs and More Bugs panels Not all SSH servers work properly. Various existing servers have bugs in them, which can make it impossible for a client to talk to @@ -3142,9 +3142,10 @@ has been deliberately configured to conceal its version number, or if the server is a version which PuTTY's bug database does not know about, then PuTTY will not know what bugs to expect. -The Bugs panel allows you to manually configure the bugs PuTTY -expects to see in the server. Each bug can be configured in three -states: +The Bugs and More Bugs panels (there are two because we have so many +bug compatibility modes) allow you to manually configure the bugs +PuTTY expects to see in the server. Each bug can be configured in +three states: \b \q{Off}: PuTTY will assume the server does not have the bug. -- 2.45.2