Attachment 3391 Details for Bug 3160 – fix compilation with DEBUG_KEXDH

[patch] fix compilation with DEBUG_KEXDH

bz3160.diff (text/plain), 1.13 KB, created by Damien Miller on 2020-05-08 13:24:15 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2020-05-08 13:24:15 AEST

Size: 1.13 KB

patch

obsolete

>Index: kexdh.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/kexdh.c,v
>retrieving revision 1.32
>diff -u -p -r1.32 kexdh.c
>--- kexdh.c	21 Jan 2019 10:40:11 -0000	1.32
>+++ kexdh.c	8 May 2020 03:23:31 -0000
>@@ -35,6 +35,7 @@
> #include "digest.h"
> #include "ssherr.h"
> #include "dh.h"
>+#include "log.h"
> 
> int
> kex_dh_keygen(struct kex *kex)
>Index: sshd.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sshd.c,v
>retrieving revision 1.552
>diff -u -p -r1.552 sshd.c
>--- sshd.c	13 Mar 2020 04:01:57 -0000	1.552
>+++ sshd.c	8 May 2020 03:23:31 -0000
>@@ -2191,10 +2191,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");
> }

Actions: View | Diff

Attachments on bug 3160: 3391