diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2017-03-06 01:37:05 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2017-03-06 01:37:05 +0000 |
commit | ca86bcf2531c7b149c95244a67853d44323e7855 (patch) | |
tree | 23390addad9593662304883efe4cae60bd1670a4 /crypto/openssh/kexgexc.c | |
parent | 53de37f8ca93019f38b66657ba5f2bf53beff012 (diff) | |
parent | 19ca85510bbe080af3faf5e9ae394608428ac953 (diff) | |
download | src-ca86bcf2531c7b149c95244a67853d44323e7855.tar.gz src-ca86bcf2531c7b149c95244a67853d44323e7855.zip |
Upgrade to OpenSSH 7.4p1.
Notes
Notes:
svn path=/head/; revision=314720
Diffstat (limited to 'crypto/openssh/kexgexc.c')
-rw-r--r-- | crypto/openssh/kexgexc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/kexgexc.c b/crypto/openssh/kexgexc.c index 71ff13352a4c..ad0d1c8c0ae1 100644 --- a/crypto/openssh/kexgexc.c +++ b/crypto/openssh/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 || |