upstream commit

deprecate ancient, pre-RFC4419 and undocumented
 SSH2_MSG_KEX_DH_GEX_REQUEST_OLD message; ok markus@ deraadt@ "seems
 reasonable" dtucker@

1 files changed, 10 insertions, 20 deletions

diff --git a/kexgexc.c b/kexgexc.c
index e8e059a88..3f20491c4 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.20 2015/01/26 06:10:03 djm Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.21 2015/04/13 02:04:08 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -65,25 +65,15 @@ kexgex_client(struct ssh *ssh)
         kex->min = DH_GRP_MIN;
         kex->max = DH_GRP_MAX;
         kex->nbits = nbits;
-        if (ssh->compat & SSH_OLD_DHGEX) {
-                /* Old GEX request */
-                if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REQUEST_OLD))
-                    != 0 ||
-                    (r = sshpkt_put_u32(ssh, kex->nbits)) != 0 ||
-                    (r = sshpkt_send(ssh)) != 0)
-                        goto out;
-                debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD(%u) sent", kex->nbits);
-        } else {
-                /* New GEX request */
-                if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REQUEST)) != 0 ||
-                    (r = sshpkt_put_u32(ssh, kex->min)) != 0 ||
-                    (r = sshpkt_put_u32(ssh, kex->nbits)) != 0 ||
-                    (r = sshpkt_put_u32(ssh, kex->max)) != 0 ||
-                    (r = sshpkt_send(ssh)) != 0)
-                        goto out;
-                debug("SSH2_MSG_KEX_DH_GEX_REQUEST(%u<%u<%u) sent",
-                    kex->min, kex->nbits, kex->max);
-        }
+        /* New GEX request */
+        if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REQUEST)) != 0 ||
+            (r = sshpkt_put_u32(ssh, kex->min)) != 0 ||
+            (r = sshpkt_put_u32(ssh, kex->nbits)) != 0 ||
+            (r = sshpkt_put_u32(ssh, kex->max)) != 0 ||
+            (r = sshpkt_send(ssh)) != 0)
+                goto out;
+        debug("SSH2_MSG_KEX_DH_GEX_REQUEST(%u<%u<%u) sent",
+            kex->min, kex->nbits, kex->max);
 #ifdef DEBUG_KEXDH
         fprintf(stderr, "\nmin = %d, nbits = %d, max = %d\n",
             kex->min, kex->nbits, kex->max);