summaryrefslogtreecommitdiff
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 010c450b8..20b1d8e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
7 [dh.c] 7 [dh.c]
8 Prevent sshd from sending DH groups with a primitive generator of zero or 8 Prevent sshd from sending DH groups with a primitive generator of zero or
9 one, even if they are listed in /etc/moduli. ok markus@ 9 one, even if they are listed in /etc/moduli. ok markus@
10 - dtucker@cvs.openbsd.org 2004/02/27 22:44:56
11 [dh.c]
12 Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone
13 ever uses one. ok markus@
10 14
1120040226 1520040226
12 - (bal) KNF our sshlogin.c even if the code looks nothing like upstream 16 - (bal) KNF our sshlogin.c even if the code looks nothing like upstream
@@ -812,4 +816,4 @@
812 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 816 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
813 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 817 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
814 818
815$Id: ChangeLog,v 1.3262 2004/02/29 09:12:33 dtucker Exp $ 819$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 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: dh.c,v 1.27 2004/02/27 22:42:47 dtucker Exp $"); 26RCSID("$OpenBSD: dh.c,v 1.28 2004/02/27 22:44:56 dtucker Exp $");
27 27
28#include "xmalloc.h" 28#include "xmalloc.h"
29 29
@@ -108,7 +108,7 @@ DH *
108choose_dh(int min, int wantbits, int max) 108choose_dh(int min, int wantbits, int max)
109{ 109{
110 FILE *f; 110 FILE *f;
111 char line[2048]; 111 char line[4096];
112 int best, bestcount, which; 112 int best, bestcount, which;
113 int linenum; 113 int linenum;
114 struct dhgroup dhg; 114 struct dhgroup dhg;