tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2004/02/27 22:49:27

Browse Source 
[dh.c]
     Reset bit counter at the right time, fixes debug output in the case where
     the DH group is rejected.  ok markus@
This commit is contained in:
Darren Tucker 2004-02-29 20:15:08 +11:00
parent c56c7ef592
commit effc84ce5b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -11,6 +11,10 @@
[dh.c] [dh.c]
Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone
ever uses one. ok markus@ ever uses one. ok markus@
- dtucker@cvs.openbsd.org 2004/02/27 22:49:27
[dh.c]
Reset bit counter at the right time, fixes debug output in the case where
the DH group is rejected. ok markus@
20040226 20040226
- (bal) KNF our sshlogin.c even if the code looks nothing like upstream - (bal) KNF our sshlogin.c even if the code looks nothing like upstream
@ -816,4 +820,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3263 2004/02/29 09:13:34 dtucker Exp $ $Id: ChangeLog,v 1.3264 2004/02/29 09:15:08 dtucker Exp $

6
dh.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: dh.c,v 1.28 2004/02/27 22:44:56 dtucker Exp $"); RCSID("$OpenBSD: dh.c,v 1.29 2004/02/27 22:49:27 dtucker Exp $");
#include "xmalloc.h" #include "xmalloc.h"
@ -197,7 +197,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
void void
dh_gen_key(DH *dh, int need) dh_gen_key(DH *dh, int need)
{ {
int i, bits_set = 0, tries = 0; int i, bits_set, tries = 0;
if (dh->p == NULL) if (dh->p == NULL)
fatal("dh_gen_key: dh->p == NULL"); fatal("dh_gen_key: dh->p == NULL");
@ -214,7 +214,7 @@ dh_gen_key(DH *dh, int need)
fatal("dh_gen_key: BN_rand failed"); fatal("dh_gen_key: BN_rand failed");
if (DH_generate_key(dh) == 0) if (DH_generate_key(dh) == 0)
fatal("DH_generate_key"); fatal("DH_generate_key");
for (i = 0; i <= BN_num_bits(dh->priv_key); i++) for (i = 0, bits_set = 0; i <= BN_num_bits(dh->priv_key); i++)
if (BN_is_bit_set(dh->priv_key, i)) if (BN_is_bit_set(dh->priv_key, i))
bits_set++; bits_set++;
debug2("dh_gen_key: priv key bits set: %d/%d", debug2("dh_gen_key: priv key bits set: %d/%d",