From 32bf9f795c820f7ba1f34e8d404607fc4b1be121 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 4 Aug 2004 10:37:53 +0000 Subject: return group14 when no primes found - fixes hang on empty /etc/moduli; ok markus@ --- usr.bin/ssh/dh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin/ssh/dh.c') diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c index 176fb74696f..044d869fb88 100644 --- a/usr.bin/ssh/dh.c +++ b/usr.bin/ssh/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