commit 482d23bcacdd3664f21cc82a5135f66fc598275f
author djm@openbsd.org <djm@openbsd.org> Thu Sep 13 02:08:33 2018 +0000
committer Damien Miller <djm@mindrot.org> Thu Sep 13 12:12:33 2018 +1000
tree 362f697a94da0a765d1dabcfbf33370b2a4df121
parent d70d061828730a56636ab6f1f24fe4a8ccefcfc1

upstream: hold our collective noses and use the openssl-1.1.x API in

OpenSSH; feedback and ok tb@ jsing@ markus@

OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417

monitor.c

diff --git a/monitor.c b/monitor.c
index d4b4b04..b30813b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -566,6 +566,7 @@
 mm_answer_moduli(int sock, struct sshbuf *m)
 {
 	DH *dh;
+	const BIGNUM *dh_p, *dh_g;
 	int r;
 	u_int min, want, max;
 
@@ -590,9 +591,10 @@
 		return (0);
 	} else {
 		/* Send first bignum */
+		DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
 		if ((r = sshbuf_put_u8(m, 1)) != 0 ||
-		    (r = sshbuf_put_bignum2(m, dh->p)) != 0 ||
-		    (r = sshbuf_put_bignum2(m, dh->g)) != 0)
+		    (r = sshbuf_put_bignum2(m, dh_p)) != 0 ||
+		    (r = sshbuf_put_bignum2(m, dh_g)) != 0)
 			fatal("%s: buffer error: %s", __func__, ssh_err(r));
 
 		DH_free(dh);