diff options
author | Colin Watson <cjwatson@debian.org> | 2016-01-14 15:07:14 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-01-14 15:07:14 +0000 |
commit | eeff4de96f5d7365750dc56912c2c62b5c28db6b (patch) | |
tree | 87e6ba5620716a6a9c1cbf84786d81cf7373ad43 /kex.c | |
parent | 651211fd4a199b299540c00c54a46e27fadb04be (diff) | |
parent | c88ac102f0eb89f2eaa314cb2e2e0ca3c890c443 (diff) |
Import openssh_7.1p2.orig.tar.gz
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: |