Import of OpenSSH 4.9p1

[gssapi-openssh.git] / openssh / regress / try-ciphers.sh

diff --git a/openssh/regress/try-ciphers.sh b/openssh/regress/try-ciphers.sh
index 15827e25040feac4c75037f1909224a1b78ae878..ef776d2ee1c7f4584e0265f9aadafd84d25ffb3b 100644 (file)
--- a/openssh/regress/try-ciphers.sh
+++ b/openssh/regress/try-ciphers.sh
@@ -1,12 +1,13 @@
-#      $OpenBSD: try-ciphers.sh,v 1.9 2004/02/28 13:44:45 dtucker Exp $
+#      $OpenBSD: try-ciphers.sh,v 1.11 2007/06/07 19:41:46 pvalchev Exp $
 #      Placed in the Public Domain.
 
 tid="try ciphers"
 
-ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc arcfour 
+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 hmac-sha1-96 hmac-md5-96"
+macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"
 
 for c in $ciphers; do
        for m in $macs; do
@@ -29,8 +30,10 @@ for c in $ciphers; do
        fi
 done
 
-if ! ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
+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