Enable all supported ciphers and macs in the server before trying

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

diff --git a/regress/usr.bin/ssh/cipher-speed.sh b/regress/usr.bin/ssh/cipher-speed.sh
index 22d1d7f..bfda94a 100644 (file)
--- a/regress/usr.bin/ssh/cipher-speed.sh
+++ b/regress/usr.bin/ssh/cipher-speed.sh
@@ -1,8 +1,18 @@
-#      $OpenBSD: cipher-speed.sh,v 1.14 2017/04/30 23:34:55 djm Exp $
+#      $OpenBSD: cipher-speed.sh,v 1.15 2022/01/21 02:54:41 dtucker Exp $
 #      Placed in the Public Domain.
 
 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 '/transferred/s/.*secs (\(.* bytes.sec\).*/\1/p'