From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 21 Jan 2022 02:54:41 +0000 (+0000)
Subject: upstream: Enable all supported ciphers and macs in the server
X-Git-Tag: V_8_9_P1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=968e508967ef42480cebad8cf3172465883baa77;p=thirdparty%2Fopenssh-portable.git

upstream: Enable all supported ciphers and macs in the server

before trying to benchmark them.  Increase the data file size to get more
signal.

OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6
---

diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index 5da95b3a9..1340bd159 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -3,6 +3,16 @@
 
 tid="cipher speed"
 
+# Enable all supported ciphers and macs.
+ciphers=`${SSH} -Q Ciphers | tr '\n' , | sed 's/,$//'`
+macs=`${SSH} -Q MACs | tr '\n' , | sed 's/,$//'`
+cat >>$OBJ/sshd_proxy <<EOD
+Ciphers $ciphers
+MACs $macs
+EOD
+
+increase_datafile_size 10000 # 10MB
+
 getbytes ()
 {
 	sed -n -e '/transferred/s/.*secs (\(.* bytes.sec\).*/\1/p' \