aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/kexgexs.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2017-03-02 00:11:32 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2017-03-02 00:11:32 +0000
commit076ad2f836d5f49dc1375f1677335a48fe0d4b82 (patch)
tree2c74554320c43f6038362284ff6d28ab31f5a2e5 /crypto/openssh/kexgexs.c
parent5adcb2b96de8857caee551f12f4165be98c303e7 (diff)
parentab4ec008e7abd1c8098428dbf9642c3685383045 (diff)
downloadsrc-076ad2f836d5f49dc1375f1677335a48fe0d4b82.tar.gz
src-076ad2f836d5f49dc1375f1677335a48fe0d4b82.zip
Upgrade to OpenSSH 7.3p1.
Notes
Notes: svn path=/head/; revision=314527
Diffstat (limited to 'crypto/openssh/kexgexs.c')
-rw-r--r--crypto/openssh/kexgexs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/kexgexs.c b/crypto/openssh/kexgexs.c
index 8c5adf7e4305..f4400dcbe86c 100644
--- a/crypto/openssh/kexgexs.c
+++ b/crypto/openssh/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.26 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.29 2016/06/08 02:13:01 dtucker Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -89,7 +89,7 @@ input_kex_dh_gex_request(int type, u_int32_t seq, void *ctxt)
nbits = MIN(DH_GRP_MAX, nbits);
if (kex->max < kex->min || kex->nbits < kex->min ||
- kex->max < kex->nbits) {
+ kex->max < kex->nbits || kex->max < DH_GRP_MIN) {
r = SSH_ERR_DH_GEX_OUT_OF_RANGE;
goto out;
}