summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-12-09 19:18:07 +1100
committerDarren Tucker <dtucker@zip.com.au>2003-12-09 19:18:07 +1100
commit564f19e2370d71129a85c3aa1130ab812c3ae3c8 (patch)
tree107575ea42ff2064753a842162580c2d15dcc094
parent3175eb9a5a426f6e494d523fe6e96fcc426995c1 (diff)
- markus@cvs.openbsd.org 2003/12/08 11:00:47
[kexgexc.c] print requested group size in debug; ok djm
-rw-r--r--ChangeLog5
-rw-r--r--kexgexc.c11
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index cbc173b6..b1376c82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
- markus@cvs.openbsd.org 2003/12/02 17:01:15
[channels.c session.c ssh-agent.c ssh.h sshd.c]
use SSH_LISTEN_BACKLOG (=128) in listen(2).
+ - markus@cvs.openbsd.org 2003/12/08 11:00:47
+ [kexgexc.c]
+ print requested group size in debug; ok djm
20031208
- (tim) [configure.ac] Bug 770. Fix --without-rpath.
@@ -1555,4 +1558,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3135 2003/12/09 08:15:11 dtucker Exp $
+$Id: ChangeLog,v 1.3136 2003/12/09 08:18:07 dtucker Exp $
diff --git a/kexgexc.c b/kexgexc.c
index f14ac44c..0193183b 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: kexgexc.c,v 1.1 2003/02/16 17:09:57 markus Exp $");
+RCSID("$OpenBSD: kexgexc.c,v 1.2 2003/12/08 11:00:47 markus Exp $");
#include "xmalloc.h"
#include "key.h"
@@ -49,16 +49,14 @@ kexgex_client(Kex *kex)
nbits = dh_estimate(kex->we_need * 8);
if (datafellows & SSH_OLD_DHGEX) {
- debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD sent");
-
/* Old GEX request */
packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST_OLD);
packet_put_int(nbits);
min = DH_GRP_MIN;
max = DH_GRP_MAX;
- } else {
- debug("SSH2_MSG_KEX_DH_GEX_REQUEST sent");
+ debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD(%u) sent", nbits);
+ } else {
/* New GEX request */
min = DH_GRP_MIN;
max = DH_GRP_MAX;
@@ -66,6 +64,9 @@ kexgex_client(Kex *kex)
packet_put_int(min);
packet_put_int(nbits);
packet_put_int(max);
+
+ debug("SSH2_MSG_KEX_DH_GEX_REQUEST(%u<%u<%u) sent",
+ min, nbits, max);
}
#ifdef DEBUG_KEXDH
fprintf(stderr, "\nmin = %d, nbits = %d, max = %d\n",