diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2016-09-12 01:22:38 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:46:29 +1000 |
| commit | 9136ec134c97a8aff2917760c03134f52945ff3c (patch) | |
| tree | bfcab357e6e0f510d9b63bac43b18097e89fa58a /kexgexs.c | |
| parent | f219fc8f03caca7ac82a38ed74bbd6432a1195e7 (diff) | |
upstream commit
Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
use those definitions rather than pulling <sys/param.h> and unknown namespace
pollution. ok djm markus dtucker
Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8
Diffstat (limited to 'kexgexs.c')
| -rw-r--r-- | kexgexs.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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) { |