Deleted obsolete files, actually add the new features and help

bench.sh

@@ -1,10 +1,25 @@
 #!/bin/sh
+# shellcheck disable=SC3000-SC4000
 
 mode=$1
 dest=$2
 
 usage() {
-    echo "Usage: ${0} <'connect'|'send'|'receive'> <destination>"
+    echo "Usage: ${0} <mode> <destination> [show [<number>]|<iterations>]"
+    echo
+    echo "Mode is one of 'connect', 'send' or 'receive'."
+    echo
+    echo "Destination is a host name or IP, optionally prefixed by username@."
+    echo
+    echo "If 'show' is given, benchmarking is skipped and existing results are shown."
+    echo "The optional <number> specifies how many of the results are shown; by"
+    echo "default only the top 10 fastest are displayed."
+    echo
+    echo "Alternatively, if instead of 'show' a number is given for <iterations>,"
+    echo "the benchmark is run that many times before showing the results. The"
+    echo "<number> can in this case not be overridden."
+    echo
+    echo "Results shown are an average of all collected results for the given host/mode."
     exit
 }
 
@@ -18,18 +33,33 @@ if [ ! "$dest" ] ; then
     usage
 fi
 
+kex=$(ssh -Q kex|grep -Ev -- '-(group-exchange|sha1|sha512|md5|nistp[^2])')
+if [ -f "kex.lst" ] ; then
+    kex=$(cat kex.lst)
+fi
+
+macs=$(ssh -Q macs|grep -Ev -- '-(sha1|512|md5)')
+if [ -f "macs.lst" ] ; then
+    macs=$(cat macs.lst)
+fi
+
+ciphers=$(ssh -Q cipher | grep -Ev -- '(3des|aes1[^2]|aes2)')
+if [ -f "ciphers.lst" ] ; then
+    ciphers=$(cat ciphers.lst)
+fi
+
 case "$mode" in
 'connect')
     prefix=''
     command='echo -n'
     ;;
 'send')
-    prefix='dd if=/dev/zero bs=4k count=256 | '
+    prefix='dd if=/dev/zero bs=4k count=2048'
     command='cat > /dev/null'
     ;;
 'receive')
     prefix=''
-    command='dd if=/dev/zero bs=4k count=256'
+    command='dd if=/dev/zero bs=4k count=2048'
     ;;
 *)
     echo "Mode must be one of connect, send, receive"
@@ -37,25 +67,66 @@ case "$mode" in
     ;;
 esac
 
-mkdir -p "$dest"
-for m in $(cat macs) ; do
-    for c in $(cat ciphers) ; do
-        for k in $(cat kex) ; do
-            echo
-            echo "${dest}/${mode}__${m}__${c}__${k}.log"
-            $prefix /usr/bin/time ssh -o MACs=$m -o Ciphers=$c -o KexAlgorithms=$k $dest "${command}" 2>&1 >/dev/null |
-                tee -a "${dest}/${mode}__${m}__${c}__${k}.log"
+showstats() {
+    local _dest="$1"
+    local _mode="$2"
+    local _top="$3"
+    local f
+
+    local headcmd="head -10"
+    if [ "${_top}" ] ; then
+        if top=$(echo "${_top}" | grep -Ev '[^0-9]' | grep -E '[0-9]') ; then
+            headcmd="head -${top}"
+        elif [ "${_top}" = 'all' ] ; then
+            headcmd="cat"
+        else
+            echo "Could not decipher number of lines to show (${_top}); ignoring"
+        fi
+    fi
+
+    if [ -d "$_dest" ] ; then
+        (
+            echo 'Destination Mode MAC Cipher KEX Time'
+            for f in "${_dest}"/"${_mode}"__*.log ; do
+                echo -n "$f " | sed -e 's/\.log//' -e 's/\// /'
+                cut -f 2 -w < "$f" | awk '{s+=$0}END{print s/NR}' RS=" "
+            done | sort -gk 2 | $headcmd | tr '_' ' '
+        ) | column -t
+    else
+        echo "${_dest} directory not found!"
+    fi
+}
+
+runbench() {
+    mkdir -p "$dest"
+    for m in $macs ; do
+        for c in $ciphers ; do
+            for k in $kex ; do
+                echo
+                echo "${dest}/${mode}__${m}__${c}__${k}.log"
+                if [ "$prefix" ] ; then
+                    $prefix 2>/dev/null | /usr/bin/time ssh -o MACs="$m" -o Ciphers="$c" -o KexAlgorithms="$k" "$dest" "${command} 2>/dev/null" 2>&1 >/dev/null |
+                        tee -a "${dest}/${mode}__${m}__${c}__${k}.log"
+                else
+                    /usr/bin/time ssh -o MACs="$m" -o Ciphers="$c" -o KexAlgorithms="$k" "$dest" "${command} 2>/dev/null" 2>&1 >/dev/null |
+                        tee -a "${dest}/${mode}__${m}__${c}__${k}.log"
+                fi
+                sleep 0.1 || break
+            done
             sleep 0.1 || break
         done
-        sleep 0.1 || break
+        sleep .01 || break
     done
-    sleep .01 || break
-done
+}
 
-(
-    echo 'Mode MAC Cipher KEX Time'
-    for f in ${dest}/*.log ; do
-        echo -n "$f "
-        cut -f 2 -w < $f | awk '{s+=$0}END{print s/NR}' RS=" "
-    done | sort -gk 2 | head -10 | tr '_' ' '
-) | column -t
+if ! [ "$3" = 'show' ] ; then
+    if iterations=$(echo "$3" | grep -Ev '[^0-9]' | grep -E '[0-9]') ; then
+        for i in $(jot -n "$iterations") ; do
+            echo "Executing iteration $i of $iterations .."
+            runbench
+        done
+    else
+        runbench
+    fi
+fi
+showstats "$dest" "$mode" "$4"

ciphers

@@ -1,3 +0,0 @@
-chacha20-poly1305@openssh.com
-aes128-ctr
-aes128-gcm@openssh.com

kex

@@ -1 +0,0 @@
-ecdh-sha2-nistp256

macs

@@ -1,9 +0,0 @@
-umac-64-etm@openssh.com
-umac-128-etm@openssh.com
-hmac-sha2-256-etm@openssh.com
-hmac-sha2-512-etm@openssh.com
-hmac-sha1-etm@openssh.com
-umac-64@openssh.com
-umac-128@openssh.com
-hmac-sha2-256
-hmac-sha1