- djm@cvs.openbsd.org 2013/01/12 11:23:53

     [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh]
     test AES-GCM modes; feedback markus@

1 files changed, 9 insertions, 2 deletions

diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index 4f26f7e96..ed7c6f320 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: cipher-speed.sh,v 1.6 2012/10/05 02:20:48 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"
@@ -16,12 +16,14 @@ 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 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"
@@ -34,6 +36,11 @@ 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=$(($n + 1))
 done; done
 
 ciphers="3des blowfish"