upstream: pass most arguments to the KEX hash functions as sshbuf

rather than pointer+length; ok markus@

OpenBSD-Commit-ID: ef0c89c52ccc89817a13a5205725148a28492bf7

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 @@
-/* $OpenBSD: kexgex.c,v 1.31 2019/01/21 10:03:37 djm Exp $ */
+/* $OpenBSD: kexgex.c,v 1.32 2019/01/23 00:30:41 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -48,9 +48,9 @@ kexgex_hash(
     int hash_alg,
     const struct sshbuf *client_version,
     const struct sshbuf *server_version,
-    const u_char *ckexinit, size_t ckexinitlen,
-    const u_char *skexinit, size_t skexinitlen,
-    const u_char *serverhostkeyblob, size_t sbloblen,
+    const struct sshbuf *client_kexinit,
+    const struct sshbuf *server_kexinit,
+    const struct sshbuf *server_host_key_blob,
     int min, int wantbits, int max,
     const BIGNUM *prime,
     const BIGNUM *gen,
@@ -69,13 +69,13 @@ kexgex_hash(
         if ((r = sshbuf_put_stringb(b, client_version)) < 0 ||
             (r = sshbuf_put_stringb(b, server_version)) < 0 ||
             /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */
-            (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 ||
+            (r = sshbuf_put_u32(b, sshbuf_len(client_kexinit) + 1)) != 0 ||
             (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
-            (r = sshbuf_put(b, ckexinit, ckexinitlen)) != 0 ||
-            (r = sshbuf_put_u32(b, skexinitlen+1)) != 0 ||
+            (r = sshbuf_putb(b, client_kexinit)) != 0 ||
+            (r = sshbuf_put_u32(b, sshbuf_len(server_kexinit) + 1)) != 0 ||
             (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
-            (r = sshbuf_put(b, skexinit, skexinitlen)) != 0 ||
-            (r = sshbuf_put_string(b, serverhostkeyblob, sbloblen)) != 0 ||
+            (r = sshbuf_putb(b, server_kexinit)) != 0 ||
+            (r = sshbuf_put_stringb(b, server_host_key_blob)) != 0 ||
             (min != -1 && (r = sshbuf_put_u32(b, min)) != 0) ||
             (r = sshbuf_put_u32(b, wantbits)) != 0 ||
             (max != -1 && (r = sshbuf_put_u32(b, max)) != 0) ||