RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-03 00:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
OpenBSD-Commit-ID: 832e771948fb45f2270e8b8895aac36d176ba17a
This commit is contained in:
djm@openbsd.org 2020-05-08 05:13:14 +00:00 committed by Damien Miller
parent 3ab6fccc39
commit ecb2c02d99
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kexdh.c
View File

@ -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)

11
sshd.c
View File

@ -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");
}