diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2017-01-31 12:33:47 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2017-01-31 12:33:47 +0000 |
| commit | 19ca85510bbe080af3faf5e9ae394608428ac953 (patch) | |
| tree | 117f9a26f0d949b937129ea841578bd2ba4390fa /kexgexc.c | |
| parent | ab4ec008e7abd1c8098428dbf9642c3685383045 (diff) | |
| download | src-test2-vendor/openssh/7.4p1.tar.gz src-test2-vendor/openssh/7.4p1.zip | |
Diffstat (limited to 'kexgexc.c')
| -rw-r--r-- | kexgexc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kexgexc.c b/kexgexc.c index 71ff13352a4c..ad0d1c8c0ae1 100644 --- a/kexgexc.c +++ b/kexgexc.c @@ -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 || |