summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2004-08-04 10:37:53 +0000
committerDamien Miller <djm@cvs.openbsd.org>2004-08-04 10:37:53 +0000
commit32bf9f795c820f7ba1f34e8d404607fc4b1be121 (patch)
tree8bcd07bd311408aa3a55e074929195c12dbf9ffa /usr.bin/ssh
parent3c84cd399d80806051a9a496fdb822df051ceb43 (diff)
return group14 when no primes found - fixes hang on empty /etc/moduli;
ok markus@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/dh.c4
1 files changed, 2 insertions, 2 deletions
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;