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

1 files changed, 17 insertions, 20 deletions

diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 925863504..084a1457a 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: try-ciphers.sh,v 1.13 2012/06/28 05:07:45 dtucker Exp $
+#       $OpenBSD: try-ciphers.sh,v 1.19 2013/02/11 23:58:51 djm Exp $
 #       Placed in the Public Domain.
 
 tid="try ciphers"
@@ -7,11 +7,20 @@ 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 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
+        hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com
+        umac-64-etm@openssh.com umac-128-etm@openssh.com
+        hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com
+        hmac-ripemd160-etm@openssh.com"
 config_defined HAVE_EVP_SHA256 &&
-    macs="$macs hmac-sha2-256 hmac-sha2-512"
+    macs="$macs hmac-sha2-256 hmac-sha2-512
+        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"
@@ -19,6 +28,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=`expr $n + 1`
         done
 done
 
@@ -32,20 +46,3 @@ for c in $ciphers; do
         fi
 done
 
-if ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
-then
-        :
-else
-
-echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy
-c=acss@openssh.org
-for m in $macs; do
-        trace "proto 2 $c mac $m"
-        verbose "test $tid: proto 2 cipher $c mac $m"
-        ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true
-        if [ $? -ne 0 ]; then
-                fail "ssh -2 failed with mac $m cipher $c"
-        fi
-done
-
-fi