Re-import of OpenSSH 3.7.1p2 (Chase\!)

[gssapi-openssh.git] / openssh / kexgexc.c

diff --git a/openssh/kexgexc.c b/openssh/kexgexc.c
index 0193183b954aa0307632e78b10f87b753748467b..f14ac44ca04321eb4eb85efdcdb9c11833e92392 100644 (file)
--- a/openssh/kexgexc.c
+++ b/openssh/kexgexc.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexgexc.c,v 1.2 2003/12/08 11:00:47 markus Exp $");
+RCSID("$OpenBSD: kexgexc.c,v 1.1 2003/02/16 17:09:57 markus Exp $");
 
 #include "xmalloc.h"
 #include "key.h"
@@ -49,14 +49,16 @@ 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;
-
-               debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD(%u) sent", nbits);
        } else {
+               debug("SSH2_MSG_KEX_DH_GEX_REQUEST sent");
+
                /* New GEX request */
                min = DH_GRP_MIN;
                max = DH_GRP_MAX;
@@ -64,9 +66,6 @@ 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",