[openssh-commits] [openssh] 01/02: upstream: fix potential hang if /etc/moduli doesn't contain the

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit c5182e3f06f9f1fd86d62b9dcd0397408dd698da
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Sat Mar 28 05:06:16 2026 +0000

    upstream: fix potential hang if /etc/moduli doesn't contain the
    
    requested DH group values; from 77c9ca, ok dtucker@, markus@
    
    OpenBSD-Commit-ID: 1bf402cdb8876237c280ac77fbf7fafd2c16c5ae
---
 monitor.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index b56646a2d..b722baef5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.254 2026/03/11 09:10:59 dtucker Exp $ */
+/* $OpenBSD: monitor.c,v 1.255 2026/03/28 05:06:16 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos at citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus at openbsd.org>
@@ -689,7 +689,6 @@ mm_answer_moduli(struct ssh *ssh, int sock, struct sshbuf *m)
 	if (dh == NULL) {
 		if ((r = sshbuf_put_u8(m, 0)) != 0)
 			fatal_fr(r, "assemble empty");
-		return (0);
 	} else {
 		/* Send first bignum */
 		DH_get0_pqg(dh, &dh_p, NULL, &dh_g);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.