From c56c7ef592e9dded048faa1443049679aacc0421 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 29 Feb 2004 20:13:34 +1100
Subject: [PATCH]    - 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@

---
 ChangeLog | 6 +++++-
 dh.c      | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 010c450b8..20b1d8e63 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 b58b8bc28..0790aff79 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;