nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-17 11:00:59 -05:00
Code Issues Projects Releases Wiki Activity

Move cipher settings into their own config panel.

Browse Source 
This makes room in the main SSH panel for new options about connection
sharing, which I'm shortly going to add.

[originally from svn r10063]
This commit is contained in:
Simon Tatham
2013-11-17 14:03:25 +00:00
parent 5ecb7d7f1d
commit a37d43069d
2 changed files with 72 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
config.c
View File

@ -2112,19 +2112,6 @@ void setup_config_box(struct controlbox *b, int midsession,
"2 only", 'y', I(3), NULL);
}
if (!midsession || protcfginfo != 1) {
s = ctrl_getset(b, "Connection/SSH", "encryption", "Encryption options");
c = ctrl_draglist(s, "Encryption cipher selection policy:", 's',
HELPCTX(ssh_ciphers),
cipherlist_handler, P(NULL));
c->listbox.height = 6;
ctrl_checkbox(s, "Enable legacy use of single-DES in SSH-2", 'i',
HELPCTX(ssh_ciphers),
conf_checkbox_handler,
I(CONF_ssh2_des_cbc));
}
/*
* The Connection/SSH/Kex panel. (Owing to repeat key
* exchange, this is all meaningful in mid-session _if_
@ -2158,6 +2145,26 @@ void setup_config_box(struct controlbox *b, int midsession,
HELPCTX(ssh_kex_repeat));
}
if (!midsession || protcfginfo != 1) {
/*
* The Connection/SSH/Cipher panel.
*/
ctrl_settitle(b, "Connection/SSH/Cipher",
"Options controlling SSH encryption");
s = ctrl_getset(b, "Connection/SSH/Cipher",
"encryption", "Encryption options");
c = ctrl_draglist(s, "Encryption cipher selection policy:", 's',
HELPCTX(ssh_ciphers),
cipherlist_handler, P(NULL));
c->listbox.height = 6;
ctrl_checkbox(s, "Enable legacy use of single-DES in SSH-2", 'i',
HELPCTX(ssh_ciphers),
conf_checkbox_handler,
I(CONF_ssh2_des_cbc));
}
if (!midsession) {
/*