summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--kexgexc.c11
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index cbc173b68..b1376c825 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
17 - markus@cvs.openbsd.org 2003/12/02 17:01:15 17 - markus@cvs.openbsd.org 2003/12/02 17:01:15
18 [channels.c session.c ssh-agent.c ssh.h sshd.c] 18 [channels.c session.c ssh-agent.c ssh.h sshd.c]
19 use SSH_LISTEN_BACKLOG (=128) in listen(2). 19 use SSH_LISTEN_BACKLOG (=128) in listen(2).
20 - markus@cvs.openbsd.org 2003/12/08 11:00:47
21 [kexgexc.c]
22 print requested group size in debug; ok djm
20 23
2120031208 2420031208
22 - (tim) [configure.ac] Bug 770. Fix --without-rpath. 25 - (tim) [configure.ac] Bug 770. Fix --without-rpath.
@@ -1555,4 +1558,4 @@
1555 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1558 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1556 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1559 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1557 1560
1558$Id: ChangeLog,v 1.3135 2003/12/09 08:15:11 dtucker Exp $ 1561$Id: ChangeLog,v 1.3136 2003/12/09 08:18:07 dtucker Exp $
diff --git a/kexgexc.c b/kexgexc.c
index f14ac44ca..0193183b9 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -24,7 +24,7 @@
24 */ 24 */
25 25
26#include "includes.h" 26#include "includes.h"
27RCSID("$OpenBSD: kexgexc.c,v 1.1 2003/02/16 17:09:57 markus Exp $"); 27RCSID("$OpenBSD: kexgexc.c,v 1.2 2003/12/08 11:00:47 markus Exp $");
28 28
29#include "xmalloc.h" 29#include "xmalloc.h"
30#include "key.h" 30#include "key.h"
@@ -49,16 +49,14 @@ kexgex_client(Kex *kex)
49 nbits = dh_estimate(kex->we_need * 8); 49 nbits = dh_estimate(kex->we_need * 8);
50 50
51 if (datafellows & SSH_OLD_DHGEX) { 51 if (datafellows & SSH_OLD_DHGEX) {
52 debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD sent");
53
54 /* Old GEX request */ 52 /* Old GEX request */
55 packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST_OLD); 53 packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST_OLD);
56 packet_put_int(nbits); 54 packet_put_int(nbits);
57 min = DH_GRP_MIN; 55 min = DH_GRP_MIN;
58 max = DH_GRP_MAX; 56 max = DH_GRP_MAX;
59 } else {
60 debug("SSH2_MSG_KEX_DH_GEX_REQUEST sent");
61 57
58 debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD(%u) sent", nbits);
59 } else {
62 /* New GEX request */ 60 /* New GEX request */
63 min = DH_GRP_MIN; 61 min = DH_GRP_MIN;
64 max = DH_GRP_MAX; 62 max = DH_GRP_MAX;
@@ -66,6 +64,9 @@ kexgex_client(Kex *kex)
66 packet_put_int(min); 64 packet_put_int(min);
67 packet_put_int(nbits); 65 packet_put_int(nbits);
68 packet_put_int(max); 66 packet_put_int(max);
67
68 debug("SSH2_MSG_KEX_DH_GEX_REQUEST(%u<%u<%u) sent",
69 min, nbits, max);
69 } 70 }
70#ifdef DEBUG_KEXDH 71#ifdef DEBUG_KEXDH
71 fprintf(stderr, "\nmin = %d, nbits = %d, max = %d\n", 72 fprintf(stderr, "\nmin = %d, nbits = %d, max = %d\n",