summaryrefslogtreecommitdiffstats
path: root/dh.c
diff options
context:
space:
mode:
Diffstat (limited to 'dh.c')
-rw-r--r--dh.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/dh.c b/dh.c
index 26deb9fb..66eb9554 100644
--- a/dh.c
+++ b/dh.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.15 2001/06/22 21:27:07 provos Exp $");
+RCSID("$OpenBSD: dh.c,v 1.16 2001/06/22 21:57:59 provos Exp $");
#include "xmalloc.h"
@@ -103,7 +103,7 @@ DH *
choose_dh(int min, int wantbits, int max)
{
FILE *f;
- char line[1024];
+ char line[2048];
int best, bestcount, which;
int linenum;
struct dhgroup dhg;
@@ -134,18 +134,14 @@ choose_dh(int min, int wantbits, int max)
if (dhg.size == best)
bestcount++;
}
- fclose (f);
+ rewind(f);
if (bestcount == 0) {
+ fclose(f);
log("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
return (NULL);
}
- f = fopen(_PATH_DH_PRIMES, "r");
- if (!f) {
- fatal("WARNING: %s disappeared, giving up", _PATH_DH_PRIMES);
- }
-
linenum = 0;
which = arc4random() % bestcount;
while (fgets(line, sizeof(line), f)) {