diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-12-13 22:42:23 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-12-18 14:50:49 +1100 |
| commit | 271df8185d9689b3fb0523f58514481b858f6843 (patch) | |
| tree | e3559b314b47faddfb0210b18e2871b6624a794f /kex.c | |
| parent | 43849a47c5f8687699eafbcb5604f6b9c395179f (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 | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.114 2015/12/10 17:08:40 mmcc Exp $ */ +/* $OpenBSD: kex.c,v 1.115 2015/12/13 22:42:23 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -283,11 +283,11 @@ kex_buf2prop(struct sshbuf *raw, int *first_kex_follows, char ***propp) debug2("%s: %s", proposal_names[i], proposal[i]); } /* first kex follows / reserved */ - if ((r = sshbuf_get_u8(b, &v)) != 0 || - (r = sshbuf_get_u32(b, &i)) != 0) + if ((r = sshbuf_get_u8(b, &v)) != 0 || /* first_kex_follows */ + (r = sshbuf_get_u32(b, &i)) != 0) /* reserved */ goto out; if (first_kex_follows != NULL) - *first_kex_follows = i; + *first_kex_follows = v; debug2("first_kex_follows %d ", v); debug2("reserved %u ", i); r = 0; |