From 9a2bd1116bf3fdb236d8b10af1acb2e7e8fe6e60 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 12 Aug 2004 22:40:59 +1000 Subject: - 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@ --- ChangeLog | 6 +++++- dh.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d034787..781a1aab 100644 --- 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 @@ -1575,4 +1579,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3491 2004/08/12 12:40:24 dtucker Exp $ +$Id: ChangeLog,v 1.3492 2004/08/12 12:40:59 dtucker Exp $ diff --git a/dh.c b/dh.c index 176fb746..044d869f 100644 --- 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; -- cgit v1.2.3