diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dh.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -8,6 +8,10 @@ | |||
8 | [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c | 8 | [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c |
9 | sshconnect1.c] | 9 | sshconnect1.c] |
10 | more s/illegal/invalid/ | 10 | more s/illegal/invalid/ |
11 | - djm@cvs.openbsd.org 2004/08/04 10:37:52 | ||
12 | [dh.c] | ||
13 | return group14 when no primes found - fixes hang on empty /etc/moduli; | ||
14 | ok markus@ | ||
11 | 15 | ||
12 | 20040720 | 16 | 20040720 |
13 | - (djm) OpenBSD CVS Sync | 17 | - (djm) OpenBSD CVS Sync |
@@ -1575,4 +1579,4 @@ | |||
1575 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1579 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1576 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1580 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1577 | 1581 | ||
1578 | $Id: ChangeLog,v 1.3491 2004/08/12 12:40:24 dtucker Exp $ | 1582 | $Id: ChangeLog,v 1.3492 2004/08/12 12:40:59 dtucker Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: dh.c,v 1.30 2004/06/13 12:53:24 djm Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.31 2004/08/04 10:37:52 djm Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
@@ -145,7 +145,7 @@ choose_dh(int min, int wantbits, int max) | |||
145 | if (bestcount == 0) { | 145 | if (bestcount == 0) { |
146 | fclose(f); | 146 | fclose(f); |
147 | logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES); | 147 | logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES); |
148 | return (NULL); | 148 | return (dh_new_group14()); |
149 | } | 149 | } |
150 | 150 | ||
151 | linenum = 0; | 151 | linenum = 0; |