summaryrefslogtreecommitdiff
path: root/kexgex.c
diff options
context:
space:
mode:
Diffstat (limited to 'kexgex.c')
-rw-r--r--kexgex.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/kexgex.c b/kexgex.c
index f828f2b20..8040a1320 100644
--- a/kexgex.c
+++ b/kexgex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexgex.c,v 1.31 2019/01/21 10:03:37 djm Exp $ */ 1/* $OpenBSD: kexgex.c,v 1.32 2019/01/23 00:30:41 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * Copyright (c) 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -48,9 +48,9 @@ kexgex_hash(
48 int hash_alg, 48 int hash_alg,
49 const struct sshbuf *client_version, 49 const struct sshbuf *client_version,
50 const struct sshbuf *server_version, 50 const struct sshbuf *server_version,
51 const u_char *ckexinit, size_t ckexinitlen, 51 const struct sshbuf *client_kexinit,
52 const u_char *skexinit, size_t skexinitlen, 52 const struct sshbuf *server_kexinit,
53 const u_char *serverhostkeyblob, size_t sbloblen, 53 const struct sshbuf *server_host_key_blob,
54 int min, int wantbits, int max, 54 int min, int wantbits, int max,
55 const BIGNUM *prime, 55 const BIGNUM *prime,
56 const BIGNUM *gen, 56 const BIGNUM *gen,
@@ -69,13 +69,13 @@ kexgex_hash(
69 if ((r = sshbuf_put_stringb(b, client_version)) < 0 || 69 if ((r = sshbuf_put_stringb(b, client_version)) < 0 ||
70 (r = sshbuf_put_stringb(b, server_version)) < 0 || 70 (r = sshbuf_put_stringb(b, server_version)) < 0 ||
71 /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */ 71 /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */
72 (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 || 72 (r = sshbuf_put_u32(b, sshbuf_len(client_kexinit) + 1)) != 0 ||
73 (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 || 73 (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
74 (r = sshbuf_put(b, ckexinit, ckexinitlen)) != 0 || 74 (r = sshbuf_putb(b, client_kexinit)) != 0 ||
75 (r = sshbuf_put_u32(b, skexinitlen+1)) != 0 || 75 (r = sshbuf_put_u32(b, sshbuf_len(server_kexinit) + 1)) != 0 ||
76 (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 || 76 (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
77 (r = sshbuf_put(b, skexinit, skexinitlen)) != 0 || 77 (r = sshbuf_putb(b, server_kexinit)) != 0 ||
78 (r = sshbuf_put_string(b, serverhostkeyblob, sbloblen)) != 0 || 78 (r = sshbuf_put_stringb(b, server_host_key_blob)) != 0 ||
79 (min != -1 && (r = sshbuf_put_u32(b, min)) != 0) || 79 (min != -1 && (r = sshbuf_put_u32(b, min)) != 0) ||
80 (r = sshbuf_put_u32(b, wantbits)) != 0 || 80 (r = sshbuf_put_u32(b, wantbits)) != 0 ||
81 (max != -1 && (r = sshbuf_put_u32(b, max)) != 0) || 81 (max != -1 && (r = sshbuf_put_u32(b, max)) != 0) ||