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

Fix ssh2 after the rev 1.54 [r649] reorg broke it

Browse Source 
[originally from svn r656]
[r649 == 960c03468d]
This commit is contained in:
Simon Tatham 2000-09-29 15:53:59 +00:00
parent 0a1fe7a9af
commit bfec52c1c9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssh.c
View File

@ -1876,18 +1876,18 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt)
} }
/* List client->server encryption algorithms. */ /* List client->server encryption algorithms. */
ssh2_pkt_addstring_start(); ssh2_pkt_addstring_start();
for (i = -1; i < lenof(ciphers); i++) { for (i = 0; i < lenof(ciphers)+1; i++) {
const struct ssh_cipher *c = i<0 ? preferred_cipher : ciphers[i]; const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1];
ssh2_pkt_addstring_str(c->name); ssh2_pkt_addstring_str(c->name);
if (i < lenof(ciphers)-1) if (i < lenof(ciphers))
ssh2_pkt_addstring_str(","); ssh2_pkt_addstring_str(",");
} }
/* List server->client encryption algorithms. */ /* List server->client encryption algorithms. */
ssh2_pkt_addstring_start(); ssh2_pkt_addstring_start();
for (i = -1; i < lenof(ciphers); i++) { for (i = 0; i < lenof(ciphers)+1; i++) {
const struct ssh_cipher *c = i<0 ? preferred_cipher : ciphers[i]; const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1];
ssh2_pkt_addstring_str(c->name); ssh2_pkt_addstring_str(c->name);
if (i < lenof(ciphers)-1) if (i < lenof(ciphers))
ssh2_pkt_addstring_str(","); ssh2_pkt_addstring_str(",");
} }
/* List client->server MAC algorithms. */ /* List client->server MAC algorithms. */
@ -1958,18 +1958,18 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt)
} }
} }
ssh2_pkt_getstring(&str, &len); /* client->server cipher */ ssh2_pkt_getstring(&str, &len); /* client->server cipher */
for (i = -1; i < lenof(ciphers); i++) { for (i = 0; i < lenof(ciphers)+1; i++) {
const struct ssh_cipher *c = i<0 ? preferred_cipher : ciphers[i]; const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1];
if (in_commasep_string(c->name, str, len)) { if (in_commasep_string(c->name, str, len)) {
cscipher_tobe = ciphers[i]; cscipher_tobe = c;
break; break;
} }
} }
ssh2_pkt_getstring(&str, &len); /* server->client cipher */ ssh2_pkt_getstring(&str, &len); /* server->client cipher */
for (i = -1; i < lenof(ciphers); i++) { for (i = 0; i < lenof(ciphers)+1; i++) {
const struct ssh_cipher *c = i<0 ? preferred_cipher : ciphers[i]; const struct ssh_cipher *c = i==0 ? preferred_cipher : ciphers[i-1];
if (in_commasep_string(c->name, str, len)) { if (in_commasep_string(c->name, str, len)) {
sccipher_tobe = ciphers[i]; sccipher_tobe = c;
break; break;
} }
} }