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 4b37ec3f36411d2c7941ad336f71369f621ec8e7..de9c417d9fe329d32d6319161b7d14659b4b06df 100644 (file)
--- 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