nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetic, to fix ssh2-des-cbc-is-std

Browse Source 
[originally from svn r3488]
This commit is contained in:
Owen Dunn 2003-10-08 20:09:55 +00:00
parent c36ec63d28
commit a03d04ba75
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -1494,7 +1494,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
cipherlist_handler, P(NULL));
c->listbox.height = 6;
ctrl_checkbox(s, "Enable non-standard use of single-DES in SSH 2", 'i',
ctrl_checkbox(s, "Enable legacy use of single-DES in SSH 2", 'i',
HELPCTX(ssh_ciphers),
dlg_stdcheckbox_handler,
I(offsetof(Config,ssh2_des_cbc)));

10
doc/config.but
View File

@ -1,4 +1,4 @@
\versionid $Id: config.but,v 1.69 2003/09/26 13:04:56 jacob Exp $
\versionid $Id: config.but,v 1.70 2003/10/08 20:09:55 owen Exp $
\C{config} Configuring PuTTY
@ -1848,10 +1848,10 @@ separate configuration of the preference orders. As a result you may
get two warnings similar to the one above, possibly with different
encryptions.
Single-DES is not supported natively in the SSH 2 draft protocol
standards. One or two server implementations do support it, by a
non-standard name. PuTTY can use single-DES to interoperate with
these servers if you enable the \q{Enable non-standard single-DES in
Single-DES is not recommended in the SSH 2 draft protocol
standards, but one or two server implementations do support it.
PuTTY can use single-DES to interoperate with
these servers if you enable the \q{Enable legacy use of single-DES in
SSH 2} option; by default this is disabled and PuTTY will stick to
the standard.

9
sshdes.c
View File

@ -942,9 +942,12 @@ static const struct ssh2_cipher ssh_3des_ssh2 = {
};
/*
* Single DES in ssh2. It isn't clear that "des-cbc" is an official
* cipher name, but ssh.com support it and apparently aren't the
* only people to do so, so we sigh and implement it anyway.
* Single DES in ssh2. "des-cbc" is marked as HISTORIC in
* draft-ietf-secsh-assignednumbers-04.txt, referring to
* FIPS-46-3. ("Single DES (i.e., DES) will be permitted
* for legacy systems only.") , but ssh.com support it and
* apparently aren't the only people to do so, so we sigh
* and implement it anyway.
*/
static const struct ssh2_cipher ssh_des_ssh2 = {
des_make_context, des3_free_context, des3_iv, des_key,