From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Tue, 20 Aug 2024 07:41:35 +0000 (+0000)
Subject: upstream: Remove duplicate curve25519-sha256 kex.
X-Git-Tag: V_9_9_P1~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7254eb26f7c0772c4b47c3b32f6d1b15855cdd8c;p=thirdparty%2Fopenssh-portable.git

upstream: Remove duplicate curve25519-sha256 kex.

curve25519-sha256@libssh.org is the pre-standardization name for the same
thing, so remove it as a duplicate.  Speeds up test by a tiny amount.

OpenBSD-Regress-ID: 5a5ee5fa1595a6e140b1cc16040bedf5996a5715
---

diff --git a/regress/rekey.sh b/regress/rekey.sh
index 4b37ec3f3..de9c417d9 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: rekey.sh,v 1.21 2024/08/20 07:27:25 dtucker Exp $
+#	$OpenBSD: rekey.sh,v 1.22 2024/08/20 07:41:35 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="rekey"
@@ -37,13 +37,19 @@ ssh_data_rekeying()
 increase_datafile_size 300
 
 opts=""
-for i in `${SSH} -Q kex`; do
+
+# Filter out duplicate curve algo
+kexs=`${SSH} -Q kex | grep -v curve25519-sha256@libssh.org`
+ciphers=`${SSH} -Q cipher`
+macs=`${SSH} -Q mac`
+
+for i in $kexs; do
 	opts="$opts KexAlgorithms=$i"
 done
-for i in `${SSH} -Q cipher`; do
+for i in $ciphers; do
 	opts="$opts Ciphers=$i"
 done
-for i in `${SSH} -Q mac`; do
+for i in $macs; do
 	opts="$opts MACs=$i"
 done