upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@

OpenBSD-Commit-ID: 832e771948fb45f2270e8b8895aac36d176ba17a

diff --git a/kexdh.c b/kexdh.c
index 67133e3394812b7a08d7123a8c40ff553a57bd1f..6e0159f9f1010e084208aeadba93b512bfe93ef1 100644 (file)
--- a/kexdh.c
+++ b/kexdh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdh.c,v 1.32 2019/01/21 10:40:11 djm Exp $ */
+/* $OpenBSD: kexdh.c,v 1.33 2020/05/08 05:13:14 djm Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
  *
@@ -42,6 +42,7 @@
 #include "digest.h"
 #include "ssherr.h"
 #include "dh.h"
+#include "log.h"
 
 int
 kex_dh_keygen(struct kex *kex)

diff --git a/sshd.c b/sshd.c
index 6f8f11a3bdac41db4eebb08ac8e6e0f8122a7c41..a345bae7012f3ddab864d771caf6a11d50b5e7c8 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.552 2020/03/13 04:01:57 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.553 2020/05/08 05:13:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2372,10 +2372,11 @@ do_ssh2_kex(struct ssh *ssh)
 
 #ifdef DEBUG_KEXDH
        /* send 1st encrypted/maced/compressed message */
-       packet_start(SSH2_MSG_IGNORE);
-       packet_put_cstring("markus");
-       packet_send();
-       packet_write_wait();
+       if ((r = sshpkt_start(ssh, SSH2_MSG_IGNORE)) != 0 ||
+           (r = sshpkt_put_cstring(ssh, "markus")) != 0 ||
+           (r = sshpkt_send(ssh)) != 0 ||
+           (r = ssh_packet_write_wait(ssh)) != 0)
+               fatal("%s: send test: %s", __func__, ssh_err(r));
 #endif
        debug("KEX done");
 }