From 235fc55c85d66dad36ed2785fe0eaafb031e46e7 Mon Sep 17 00:00:00 2001 From: dtucker Date: Tue, 20 Aug 2024 07:41:35 +0000 Subject: [PATCH] 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. --- regress/usr.bin/ssh/rekey.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/regress/usr.bin/ssh/rekey.sh b/regress/usr.bin/ssh/rekey.sh index 4b37ec3f364..de9c417d9fe 100644 --- a/regress/usr.bin/ssh/rekey.sh +++ b/regress/usr.bin/ssh/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 -- 2.20.1