diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-05-08 05:13:14 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-05-27 10:09:18 +1000 |
commit | ecb2c02d994b3e21994f31a70ff911667c262f1f (patch) | |
tree | ab423f815688f41e6209c35a51ddba9d9eabcc0a | |
parent | 3ab6fccc3935e9b778ff52f9c8d40f215d58e01d (diff) | |
download | openssh-ecb2c02d994b3e21994f31a70ff911667c262f1f.tar.gz |
upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@
OpenBSD-Commit-ID: 832e771948fb45f2270e8b8895aac36d176ba17a
-rw-r--r-- | kexdh.c | 3 | ||||
-rw-r--r-- | sshd.c | 11 |
2 files changed, 8 insertions, 6 deletions
@@ -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) @@ -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"); } |