summaryrefslogtreecommitdiff
path: root/kexgexc.c
diff options
context:
space:
mode:
Diffstat (limited to 'kexgexc.c')
-rw-r--r--kexgexc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kexgexc.c b/kexgexc.c
index 71ff13352..ad0d1c8c0 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexgexc.c,v 1.22 2015/05/26 23:23:40 dtucker Exp $ */ 1/* $OpenBSD: kexgexc.c,v 1.23 2016/09/12 01:22:38 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * Copyright (c) 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -28,7 +28,6 @@
28 28
29#ifdef WITH_OPENSSL 29#ifdef WITH_OPENSSL
30 30
31#include <sys/param.h>
32#include <sys/types.h> 31#include <sys/types.h>
33 32
34#include <openssl/dh.h> 33#include <openssl/dh.h>
@@ -50,6 +49,7 @@
50#include "dispatch.h" 49#include "dispatch.h"
51#include "ssherr.h" 50#include "ssherr.h"
52#include "sshbuf.h" 51#include "sshbuf.h"
52#include "misc.h"
53 53
54static int input_kex_dh_gex_group(int, u_int32_t, void *); 54static int input_kex_dh_gex_group(int, u_int32_t, void *);
55static int input_kex_dh_gex_reply(int, u_int32_t, void *); 55static int input_kex_dh_gex_reply(int, u_int32_t, void *);
@@ -67,7 +67,7 @@ kexgex_client(struct ssh *ssh)
67 kex->max = DH_GRP_MAX; 67 kex->max = DH_GRP_MAX;
68 kex->nbits = nbits; 68 kex->nbits = nbits;
69 if (datafellows & SSH_BUG_DHGEX_LARGE) 69 if (datafellows & SSH_BUG_DHGEX_LARGE)
70 kex->nbits = MIN(kex->nbits, 4096); 70 kex->nbits = MINIMUM(kex->nbits, 4096);
71 /* New GEX request */ 71 /* New GEX request */
72 if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REQUEST)) != 0 || 72 if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_DH_GEX_REQUEST)) != 0 ||
73 (r = sshpkt_put_u32(ssh, kex->min)) != 0 || 73 (r = sshpkt_put_u32(ssh, kex->min)) != 0 ||