upstream commit

unbreak connections with peers that set
 first_kex_follows; fix from Matt Johnston va bz#2515

Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b

1 files changed, 5 insertions, 5 deletions

diff --git a/kex.c b/kex.c
index 5100c661d..b777b7d50 100644
--- a/kex.c
+++ b/kex.c
@@ -270,13 +270,13 @@ kex_buf2prop(struct sshbuf *raw, int *first_kex_follows, char ***propp)
                 debug2("kex_parse_kexinit: %s", 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;
-        debug2("kex_parse_kexinit: first_kex_follows %d ", v);
-        debug2("kex_parse_kexinit: reserved %u ", i);
+                *first_kex_follows = v;
+        debug2("first_kex_follows %d ", v);
+        debug2("reserved %u ", i);
         r = 0;
         *propp = proposal;
  out: