diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-12-23 02:03:02 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-12-23 02:03:02 +0000 |
commit | 1f53083fc47e1ebd9f08f8d04035720316385560 (patch) | |
tree | 6e7d39677eee6c983a1db44fc85a6a88f80e0a92 | |
parent | f49dbff61d9729962b91b293ec65d85d810dbd26 (diff) |
- markus@cvs.openbsd.org 2002/11/21 22:22:50
[dh.c]
debug->debug2
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dh.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -10,6 +10,9 @@ | |||
10 | [clientloop.c] | 10 | [clientloop.c] |
11 | don't overwrite SIG{INT,QUIT,TERM} handler if set to SIG_IGN; | 11 | don't overwrite SIG{INT,QUIT,TERM} handler if set to SIG_IGN; |
12 | e.g. if ssh is used for backup; report Joerg Schilling; ok millert@ | 12 | e.g. if ssh is used for backup; report Joerg Schilling; ok millert@ |
13 | - markus@cvs.openbsd.org 2002/11/21 22:22:50 | ||
14 | [dh.c] | ||
15 | debug->debug2 | ||
13 | 16 | ||
14 | 20021205 | 17 | 20021205 |
15 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org | 18 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org |
@@ -845,4 +848,4 @@ | |||
845 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 848 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
846 | ok provos@ | 849 | ok provos@ |
847 | 850 | ||
848 | $Id: ChangeLog,v 1.2517 2002/12/23 02:01:55 mouring Exp $ | 851 | $Id: ChangeLog,v 1.2518 2002/12/23 02:03:02 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: dh.c,v 1.22 2002/06/27 08:49:44 markus Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.23 2002/11/21 22:22:50 markus Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
@@ -182,7 +182,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) | |||
182 | for (i = 0; i <= n; i++) | 182 | for (i = 0; i <= n; i++) |
183 | if (BN_is_bit_set(dh_pub, i)) | 183 | if (BN_is_bit_set(dh_pub, i)) |
184 | bits_set++; | 184 | bits_set++; |
185 | debug("bits set: %d/%d", bits_set, BN_num_bits(dh->p)); | 185 | debug2("bits set: %d/%d", bits_set, BN_num_bits(dh->p)); |
186 | 186 | ||
187 | /* if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial */ | 187 | /* if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial */ |
188 | if (bits_set > 1 && (BN_cmp(dh_pub, dh->p) == -1)) | 188 | if (bits_set > 1 && (BN_cmp(dh_pub, dh->p) == -1)) |
@@ -214,7 +214,7 @@ dh_gen_key(DH *dh, int need) | |||
214 | for (i = 0; i <= BN_num_bits(dh->priv_key); i++) | 214 | for (i = 0; i <= BN_num_bits(dh->priv_key); i++) |
215 | if (BN_is_bit_set(dh->priv_key, i)) | 215 | if (BN_is_bit_set(dh->priv_key, i)) |
216 | bits_set++; | 216 | bits_set++; |
217 | debug("dh_gen_key: priv key bits set: %d/%d", | 217 | debug2("dh_gen_key: priv key bits set: %d/%d", |
218 | bits_set, BN_num_bits(dh->priv_key)); | 218 | bits_set, BN_num_bits(dh->priv_key)); |
219 | if (tries++ > 10) | 219 | if (tries++ > 10) |
220 | fatal("dh_gen_key: too many bad keys: giving up"); | 220 | fatal("dh_gen_key: too many bad keys: giving up"); |