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

1 files changed, 4 insertions, 2 deletions

diff --git a/monitor.c b/monitor.c
index d4b4b0471..b30813b4d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -566,6 +566,7 @@ int
 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 @@ mm_answer_moduli(int sock, struct sshbuf *m)
                 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);