From c4490d08a259437ddd2625bd6cc0200aa9342bb8 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Thu, 20 Aug 2020 16:42:41 -0700 Subject: Revert "upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@" This reverts commit ecb2c02d994b3e21994f31a70ff911667c262f1f. This aligns better with the V_8_3_P1 tag. Bug: 162492243 Change-Id: I9e734da9035685c1d9a29f703c889847820daaf9 --- kexdh.c | 3 +-- sshd.c | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kexdh.c b/kexdh.c index 6e0159f9..67133e33 100644 --- a/kexdh.c +++ b/kexdh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexdh.c,v 1.33 2020/05/08 05:13:14 djm Exp $ */ +/* $OpenBSD: kexdh.c,v 1.32 2019/01/21 10:40:11 djm Exp $ */ /* * Copyright (c) 2019 Markus Friedl. All rights reserved. * @@ -42,7 +42,6 @@ #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 26f92cbf..fba25e6b 100644 --- a/sshd.c +++ b/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.553 2020/05/08 05:13:14 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.552 2020/03/13 04:01:57 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -2374,11 +2374,10 @@ do_ssh2_kex(struct ssh *ssh) #ifdef DEBUG_KEXDH /* send 1st encrypted/maced/compressed message */ - 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)); + packet_start(SSH2_MSG_IGNORE); + packet_put_cstring("markus"); + packet_send(); + packet_write_wait(); #endif debug("KEX done"); } -- cgit v1.2.3