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 5da95b3a9e707982463318db47ee858d6a6e7dda..1340bd159873fd0c60d741ccc387c8a0ea2ba357 100644 (file)
--- 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' \