The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

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

diff --git a/openssh/regress/try-ciphers.sh b/openssh/regress/try-ciphers.sh
index 379fe353a7bc58eeb087ce89c7272e40a544ccbb..161f039c072857fa14ac1ef8da51cbb06a1d5247 100644 (file)
--- a/openssh/regress/try-ciphers.sh
+++ b/openssh/regress/try-ciphers.sh
@@ -1,12 +1,10 @@
-#      $OpenBSD: try-ciphers.sh,v 1.10 2005/05/24 04:10:54 djm Exp $
+#      $OpenBSD: try-ciphers.sh,v 1.7 2002/04/03 09:30:01 markus Exp $
 #      Placed in the Public Domain.
 
 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"
+ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc arcfour 
+       aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se"
 macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96"
 
 for c in $ciphers; do
@@ -29,21 +27,3 @@ for c in $ciphers; do
                fail "ssh -1 failed with cipher $c"
        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