- 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/try-ciphers.sh b/regress/try-ciphers.sh
index 2b11b59ea..ca2851713 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: try-ciphers.sh,v 1.17 2012/12/11 23:12:13 markus Exp $
+#       $OpenBSD: try-ciphers.sh,v 1.18 2013/01/12 11:23:53 djm Exp $
 #       Placed in the Public Domain.
 
 tid="try ciphers"
@@ -6,7 +6,8 @@ tid="try ciphers"
 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"
+        aes128-ctr aes192-ctr aes256-ctr
+        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
         hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com
@@ -18,6 +19,7 @@ config_defined HAVE_EVP_SHA256 &&
         hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com"
 
 for c in $ciphers; do
+        n=0
         for m in $macs; do
                 trace "proto 2 cipher $c mac $m"
                 verbose "test $tid: proto 2 cipher $c mac $m"
@@ -25,6 +27,11 @@ for c in $ciphers; do
                 if [ $? -ne 0 ]; then
                         fail "ssh -2 failed with mac $m cipher $c"
                 fi
+                # 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