diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dh.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -11,6 +11,10 @@ | |||
11 | [dh.c] | 11 | [dh.c] |
12 | Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone | 12 | Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone |
13 | ever uses one. ok markus@ | 13 | ever uses one. ok markus@ |
14 | - dtucker@cvs.openbsd.org 2004/02/27 22:49:27 | ||
15 | [dh.c] | ||
16 | Reset bit counter at the right time, fixes debug output in the case where | ||
17 | the DH group is rejected. ok markus@ | ||
14 | 18 | ||
15 | 20040226 | 19 | 20040226 |
16 | - (bal) KNF our sshlogin.c even if the code looks nothing like upstream | 20 | - (bal) KNF our sshlogin.c even if the code looks nothing like upstream |
@@ -816,4 +820,4 @@ | |||
816 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 820 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
817 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 821 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
818 | 822 | ||
819 | $Id: ChangeLog,v 1.3263 2004/02/29 09:13:34 dtucker Exp $ | 823 | $Id: ChangeLog,v 1.3264 2004/02/29 09:15:08 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.28 2004/02/27 22:44:56 dtucker Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.29 2004/02/27 22:49:27 dtucker Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
@@ -197,7 +197,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) | |||
197 | void | 197 | void |
198 | dh_gen_key(DH *dh, int need) | 198 | dh_gen_key(DH *dh, int need) |
199 | { | 199 | { |
200 | int i, bits_set = 0, tries = 0; | 200 | int i, bits_set, tries = 0; |
201 | 201 | ||
202 | if (dh->p == NULL) | 202 | if (dh->p == NULL) |
203 | fatal("dh_gen_key: dh->p == NULL"); | 203 | fatal("dh_gen_key: dh->p == NULL"); |
@@ -214,7 +214,7 @@ dh_gen_key(DH *dh, int need) | |||
214 | fatal("dh_gen_key: BN_rand failed"); | 214 | fatal("dh_gen_key: BN_rand failed"); |
215 | if (DH_generate_key(dh) == 0) | 215 | if (DH_generate_key(dh) == 0) |
216 | fatal("DH_generate_key"); | 216 | fatal("DH_generate_key"); |
217 | for (i = 0; i <= BN_num_bits(dh->priv_key); i++) | 217 | for (i = 0, bits_set = 0; i <= BN_num_bits(dh->priv_key); i++) |
218 | if (BN_is_bit_set(dh->priv_key, i)) | 218 | if (BN_is_bit_set(dh->priv_key, i)) |
219 | bits_set++; | 219 | bits_set++; |
220 | debug2("dh_gen_key: priv key bits set: %d/%d", | 220 | debug2("dh_gen_key: priv key bits set: %d/%d", |