merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 16 insertions, 9 deletions

diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index 5800f4b09..65e5f35ec 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -1,29 +1,31 @@
-#       $OpenBSD: cipher-speed.sh,v 1.5 2012/06/28 05:07:45 dtucker Exp $
+#       $OpenBSD: cipher-speed.sh,v 1.7 2013/01/12 11:23:53 djm Exp $
 #       Placed in the Public Domain.
 
 tid="cipher speed"
 
 getbytes ()
 {
-        sed -n '/transferred/s/.*secs (\(.* bytes.sec\).*/\1/p'
+        sed -n -e '/transferred/s/.*secs (\(.* bytes.sec\).*/\1/p' \
+            -e '/copied/s/.*s, \(.* MB.s\).*/\1/p'
 }
 
 tries="1 2"
-DATA=/bin/ls
-DATA=/bsd
 
 ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc 
         arcfour128 arcfour256 arcfour 
         aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
         aes128-ctr aes192-ctr aes256-ctr"
-macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"
-config_defined HAVE_EVP_SHA256 &&
+config_defined OPENSSL_HAVE_EVPGCM && \
+        ciphers="$ciphers aes128-gcm@openssh.com aes256-gcm@openssh.com"
+macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
+        hmac-sha1-96 hmac-md5-96"
+config_defined HAVE_EVP_SHA256 && \
     macs="$macs hmac-sha2-256 hmac-sha2-512"
 
-for c in $ciphers; do for m in $macs; do
+for c in $ciphers; do n=0; for m in $macs; do
         trace "proto 2 cipher $c mac $m"
         for x in $tries; do
-                echon "$c/$m:\t"
+                printf "%-60s" "$c/$m:"
                 ( ${SSH} -o 'compression no' \
                         -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \
                         exec sh -c \'"dd of=/dev/null obs=32k"\' \
@@ -33,13 +35,18 @@ for c in $ciphers; do for m in $macs; do
                         fail "ssh -2 failed with mac $m cipher $c"
                 fi
         done
+        # No point trying all MACs for GCM since they are ignored.
+        case $c in
+        aes*-gcm@openssh.com)   test $n -gt 0 && break;;
+        esac
+        n=`expr $n + 1`
 done; done
 
 ciphers="3des blowfish"
 for c in $ciphers; do
         trace "proto 1 cipher $c"
         for x in $tries; do
-                echon "$c:\t"
+                printf "%-60s" "$c:"
                 ( ${SSH} -o 'compression no' \
                         -F $OBJ/ssh_proxy -1 -c $c somehost \
                         exec sh -c \'"dd of=/dev/null obs=32k"\' \