summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kex.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kex.c b/kex.c
index 8243164f4..2dba1c56b 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.114 2015/12/10 17:08:40 mmcc Exp $ */ 1/* $OpenBSD: kex.c,v 1.115 2015/12/13 22:42:23 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -283,11 +283,11 @@ kex_buf2prop(struct sshbuf *raw, int *first_kex_follows, char ***propp)
283 debug2("%s: %s", proposal_names[i], proposal[i]); 283 debug2("%s: %s", proposal_names[i], proposal[i]);
284 } 284 }
285 /* first kex follows / reserved */ 285 /* first kex follows / reserved */
286 if ((r = sshbuf_get_u8(b, &v)) != 0 || 286 if ((r = sshbuf_get_u8(b, &v)) != 0 || /* first_kex_follows */
287 (r = sshbuf_get_u32(b, &i)) != 0) 287 (r = sshbuf_get_u32(b, &i)) != 0) /* reserved */
288 goto out; 288 goto out;
289 if (first_kex_follows != NULL) 289 if (first_kex_follows != NULL)
290 *first_kex_follows = i; 290 *first_kex_follows = v;
291 debug2("first_kex_follows %d ", v); 291 debug2("first_kex_follows %d ", v);
292 debug2("reserved %u ", i); 292 debug2("reserved %u ", i);
293 r = 0; 293 r = 0;