aboutsummaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2016-01-19 10:10:58 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2016-01-19 10:10:58 +0000
commit4cb2962809c63c51f6f7e029b95f2bdb622f1e4a (patch)
treef6d7eaf2dffb55ee5734fc7dba7ef0ed9f73c654 /kex.c
parenta7a7e85cd3829fe5c5348d8fbd25e98c3b315b58 (diff)
downloadsrc-4cb2962809c63c51f6f7e029b95f2bdb622f1e4a.tar.gz
src-4cb2962809c63c51f6f7e029b95f2bdb622f1e4a.zip
Vendor import of OpenSSH 7.1p2.vendor/openssh/7.1p2
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=294315 svn path=/vendor-crypto/openssh/7.1p2/; revision=294316; tag=vendor/openssh/7.1p2
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kex.c b/kex.c
index 5100c661d795..b777b7d50f80 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: