From 653ae11c4a24a50188a57f51459d795e16d1a7b8 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 30 Mar 2001 10:49:05 +1000 Subject: [PATCH] - OpenBSD CVS Sync - provos@cvs.openbsd.org 2001/03/29 14:24:59 [sshconnect2.c] use recommended defaults --- ChangeLog | 5 ++++- sshconnect2.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5260b890f..057d1fc10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ - markus@cvs.openbsd.org 2001/03/28 22:43:31 [auth.h auth2.c auth2-chall.c] check auth_root_allowed for kbd-int auth, too. + - provos@cvs.openbsd.org 2001/03/29 14:24:59 + [sshconnect2.c] + use recommended defaults 20010329 - OpenBSD CVS Sync @@ -4780,4 +4783,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1038 2001/03/30 00:48:31 djm Exp $ +$Id: ChangeLog,v 1.1039 2001/03/30 00:49:05 djm Exp $ diff --git a/sshconnect2.c b/sshconnect2.c index 7a8c77b67..69249c384 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.58 2001/03/28 21:59:40 provos Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.59 2001/03/29 14:24:59 provos Exp $"); #include #include @@ -336,7 +336,7 @@ ssh_dhgex_client(Kex *kex, char *host, struct sockaddr *hostaddr, /* New GEX request */ min = DH_GRP_MIN; - max = MIN(DH_GRP_MAX, nbits * 1.25); + max = DH_GRP_MAX; packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST); packet_put_int(min);