Import openssh_7.4p1.orig.tar.gz

1 files changed, 6 insertions, 6 deletions

diff --git a/kexgexs.c b/kexgexs.c
index f4400dcbe..449603592 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.29 2016/06/08 02:13:01 dtucker Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.30 2016/09/12 01:22:38 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -28,7 +28,6 @@
 
 #ifdef WITH_OPENSSL
 
-#include <sys/param.h>  /* MIN MAX */
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -53,6 +52,7 @@
 #include "dispatch.h"
 #include "ssherr.h"
 #include "sshbuf.h"
+#include "misc.h"
 
 static int input_kex_dh_gex_request(int, u_int32_t, void *);
 static int input_kex_dh_gex_init(int, u_int32_t, void *);
@@ -83,10 +83,10 @@ input_kex_dh_gex_request(int type, u_int32_t seq, void *ctxt)
         kex->nbits = nbits;
         kex->min = min;
         kex->max = max;
-        min = MAX(DH_GRP_MIN, min);
-        max = MIN(DH_GRP_MAX, max);
-        nbits = MAX(DH_GRP_MIN, nbits);
-        nbits = MIN(DH_GRP_MAX, nbits);
+        min = MAXIMUM(DH_GRP_MIN, min);
+        max = MINIMUM(DH_GRP_MAX, max);
+        nbits = MAXIMUM(DH_GRP_MIN, nbits);
+        nbits = MINIMUM(DH_GRP_MAX, nbits);
 
         if (kex->max < kex->min || kex->nbits < kex->min ||
             kex->max < kex->nbits || kex->max < DH_GRP_MIN) {