diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2016-09-12 03:22:38 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 05:46:29 +0200 |
| commit | 9136ec134c97a8aff2917760c03134f52945ff3c (patch) | |
| tree | bfcab357e6e0f510d9b63bac43b18097e89fa58a /kexgexc.c | |
| parent | upstream commit (diff) | |
| download | openssh-9136ec134c97a8aff2917760c03134f52945ff3c.tar.xz openssh-9136ec134c97a8aff2917760c03134f52945ff3c.zip | |
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 'kexgexc.c')
| -rw-r--r-- | kexgexc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kexgexc.c,v 1.22 2015/05/26 23:23:40 dtucker Exp $ */ +/* $OpenBSD: kexgexc.c,v 1.23 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> #include <sys/types.h> #include <openssl/dh.h> @@ -50,6 +49,7 @@ #include "dispatch.h" #include "ssherr.h" #include "sshbuf.h" +#include "misc.h" static int input_kex_dh_gex_group(int, u_int32_t, void *); static int input_kex_dh_gex_reply(int, u_int32_t, void *); @@ -67,7 +67,7 @@ kexgex_client(struct ssh *ssh) kex->max = DH_GRP_MAX; kex->nbits = nbits; if (datafellows & SSH_BUG_DHGEX_LARGE) - kex->nbits = MIN(kex->nbits, 4096); + kex->nbits = MINIMUM(kex->nbits, 4096); /* New GEX request */ if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REQUEST)) != 0 || (r = sshpkt_put_u32(ssh, kex->min)) != 0 || |