diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-12-13 22:42:23 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-01-14 12:10:38 +1100 |
commit | f72adc0150011a28f177617a8456e1f83733099d (patch) | |
tree | a9f8e51b58173188ce570aea621f37f59f425aef /kex.c | |
parent | 04bd8d019ccd906cac1a2b362517b8505f3759e6 (diff) |
upstream commit
unbreak connections with peers that set
first_kex_follows; fix from Matt Johnston va bz#2515
Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -270,13 +270,13 @@ kex_buf2prop(struct sshbuf *raw, int *first_kex_follows, char ***propp) | |||
270 | debug2("kex_parse_kexinit: %s", proposal[i]); | 270 | debug2("kex_parse_kexinit: %s", proposal[i]); |
271 | } | 271 | } |
272 | /* first kex follows / reserved */ | 272 | /* first kex follows / reserved */ |
273 | if ((r = sshbuf_get_u8(b, &v)) != 0 || | 273 | if ((r = sshbuf_get_u8(b, &v)) != 0 || /* first_kex_follows */ |
274 | (r = sshbuf_get_u32(b, &i)) != 0) | 274 | (r = sshbuf_get_u32(b, &i)) != 0) /* reserved */ |
275 | goto out; | 275 | goto out; |
276 | if (first_kex_follows != NULL) | 276 | if (first_kex_follows != NULL) |
277 | *first_kex_follows = i; | 277 | *first_kex_follows = v; |
278 | debug2("kex_parse_kexinit: first_kex_follows %d ", v); | 278 | debug2("first_kex_follows %d ", v); |
279 | debug2("kex_parse_kexinit: reserved %u ", i); | 279 | debug2("reserved %u ", i); |
280 | r = 0; | 280 | r = 0; |
281 | *propp = proposal; | 281 | *propp = proposal; |
282 | out: | 282 | out: |