1 files changed, 7 insertions, 3 deletions

diff --git a/monitor.c b/monitor.c
index d4b4b0471..531b2993a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -29,7 +29,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "openbsd-compat/sys-tree.h"
 #include <sys/wait.h>
 
 #include <errno.h>
@@ -60,7 +59,10 @@
 #include <openssl/dh.h>
 #endif
 
+#include "openbsd-compat/sys-tree.h"
 #include "openbsd-compat/sys-queue.h"
+#include "openbsd-compat/openssl-compat.h"
+
 #include "atomicio.h"
 #include "xmalloc.h"
 #include "ssh.h"
@@ -566,6 +568,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 +593,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);