- djm@cvs.openbsd.org 2004/08/04 10:37:52

     [dh.c]
     return group14 when no primes found - fixes hang on empty /etc/moduli;
     ok markus@

diff --git a/ChangeLog b/ChangeLog
index ede25591f4569263dd7bace47f1fcf99da7dbb82..528b8c83cda61a687c6ec6e8adf459062c7b3e2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
      [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c
      sshconnect1.c]
      more s/illegal/invalid/
+   - djm@cvs.openbsd.org 2004/08/04 10:37:52
+     [dh.c]
+     return group14 when no primes found - fixes hang on empty /etc/moduli;
+     ok markus@
 
 20040720
  - (djm) OpenBSD CVS Sync

diff --git a/dh.c b/dh.c
index 176fb74696fc09d88ea253caa2de59cb1703da4a..044d869fb8838934bbc88cb8fc635bbbfd1235f1 100644 (file)
--- a/dh.c
+++ b/dh.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.30 2004/06/13 12:53:24 djm Exp $");
+RCSID("$OpenBSD: dh.c,v 1.31 2004/08/04 10:37:52 djm Exp $");
 
 #include "xmalloc.h"
 
@@ -145,7 +145,7 @@ choose_dh(int min, int wantbits, int max)
        if (bestcount == 0) {
                fclose(f);
                logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
-               return (NULL);
+               return (dh_new_group14());
        }
 
        linenum = 0;