summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-02-29 20:13:34 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-02-29 20:13:34 +1100
commitc56c7ef592e9dded048faa1443049679aacc0421 (patch)
tree6bb762c15f364413e3e32ba4726becb5a8b49a6b
parentfc113c97a3935896869e8bccf7a70cb7c7ed95d3 (diff)
- dtucker@cvs.openbsd.org 2004/02/27 22:44:56
[dh.c] Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone ever uses one. ok markus@
-rw-r--r--ChangeLog6
-rw-r--r--dh.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 010c450b..20b1d8e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
[dh.c]
Prevent sshd from sending DH groups with a primitive generator of zero or
one, even if they are listed in /etc/moduli. ok markus@
+ - dtucker@cvs.openbsd.org 2004/02/27 22:44:56
+ [dh.c]
+ Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone
+ ever uses one. ok markus@
20040226
- (bal) KNF our sshlogin.c even if the code looks nothing like upstream
@@ -812,4 +816,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.3262 2004/02/29 09:12:33 dtucker Exp $
+$Id: ChangeLog,v 1.3263 2004/02/29 09:13:34 dtucker Exp $
diff --git a/dh.c b/dh.c
index b58b8bc2..0790aff7 100644
--- a/dh.c
+++ b/dh.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.27 2004/02/27 22:42:47 dtucker Exp $");
+RCSID("$OpenBSD: dh.c,v 1.28 2004/02/27 22:44:56 dtucker Exp $");
#include "xmalloc.h"
@@ -108,7 +108,7 @@ DH *
choose_dh(int min, int wantbits, int max)
{
FILE *f;
- char line[2048];
+ char line[4096];
int best, bestcount, which;
int linenum;
struct dhgroup dhg;