diff options
| author |   djm <djm@openbsd.org> | 2015-03-26 06:59:28 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-03-26 06:59:28 +0000 |
| commit | b16240db80bb339c801d62b60b22c6110ece21db (patch) | |
| tree | 692c573175d0ad955ad1980bc8a49778a350c7ef /usr.bin/ssh/dh.c | |
| parent | additional params from libdrm 2.4.60 (diff) | |
| download | wireguard-openbsd-b16240db80bb339c801d62b60b22c6110ece21db.tar.xz wireguard-openbsd-b16240db80bb339c801d62b60b22c6110ece21db.zip | |
relax bits needed check to allow diffie-hellman-group1-sha1 key
exchange to complete for chacha20-poly1305 was selected as
symmetric cipher; ok markus
Diffstat (limited to 'usr.bin/ssh/dh.c')
| -rw-r--r-- | usr.bin/ssh/dh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c index 00d6cdc69f7..8b3b960802c 100644 --- a/usr.bin/ssh/dh.c +++ b/usr.bin/ssh/dh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.55 2015/01/20 23:14:00 deraadt Exp $ */ +/* $OpenBSD: dh.c,v 1.56 2015/03/26 06:59:28 djm Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -258,7 +258,7 @@ dh_gen_key(DH *dh, int need) if (need < 0 || dh->p == NULL || (pbits = BN_num_bits(dh->p)) <= 0 || - need > INT_MAX / 2 || 2 * need >= pbits) + need > INT_MAX / 2 || 2 * need > pbits) return SSH_ERR_INVALID_ARGUMENT; dh->length = MIN(need * 2, pbits - 1); if (DH_generate_key(dh) == 0 || |