- dtucker@cvs.openbsd.org 2007/06/12 11:56:15

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

diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 103f410a804ec9e47e7fbc38417589d51796c933..379fe353a7bc58eeb087ce89c7272e40a544ccbb 100644 (file)
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,9 +1,10 @@
-#      $OpenBSD: try-ciphers.sh,v 1.9 2004/02/28 13:44:45 dtucker Exp $
+#      $OpenBSD: try-ciphers.sh,v 1.10 2005/05/24 04:10:54 djm 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"
@@ -29,6 +30,11 @@ 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
@@ -39,3 +45,5 @@ for m in $macs; do
                fail "ssh -2 failed with mac $m cipher $c"
        fi
 done
+
+fi