1 files changed, 6 insertions, 17 deletions

diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index 489d9f5fa..a6d53a78d 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: cipher-speed.sh,v 1.9 2013/05/17 04:29:14 dtucker Exp $
+#       $OpenBSD: cipher-speed.sh,v 1.11 2013/11/21 03:18:51 djm Exp $
 #       Placed in the Public Domain.
 
 tid="cipher speed"
@@ -11,18 +11,7 @@ getbytes ()
 
 tries="1 2"
 
-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"
-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 n=0; for m in $macs; do
+for c in `${SSH} -Q cipher`; do n=0; for m in `${SSH} -Q mac`; do
         trace "proto 2 cipher $c mac $m"
         for x in $tries; do
                 printf "%-60s" "$c/$m:"
@@ -35,10 +24,10 @@ for c in $ciphers; do n=0; 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
+        # No point trying all MACs for AEAD ciphers since they are ignored.
+        if ssh -Q cipher-auth | grep "^${c}\$" >/dev/null 2>&1 ; then
+                break
+        fi
         n=`expr $n + 1`
 done; done