1 files changed, 5 insertions, 19 deletions

diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 889a735d2..e04268ba3 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: try-ciphers.sh,v 1.25 2015/03/24 20:22:17 markus Exp $
+#       $OpenBSD: try-ciphers.sh,v 1.26 2017/04/30 23:34:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="try ciphers"
@@ -8,14 +8,14 @@ cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 for c in `${SSH} -Q cipher`; do
         n=0
         for m in `${SSH} -Q mac`; do
-                trace "proto 2 cipher $c mac $m"
-                verbose "test $tid: proto 2 cipher $c mac $m"
+                trace "cipher $c mac $m"
+                verbose "test $tid: cipher $c mac $m"
                 cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
                 echo "Ciphers=$c" >> $OBJ/sshd_proxy
                 echo "MACs=$m" >> $OBJ/sshd_proxy
-                ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true
+                ${SSH} -F $OBJ/ssh_proxy -m $m -c $c somehost true
                 if [ $? -ne 0 ]; then
-                        fail "ssh -2 failed with mac $m cipher $c"
+                        fail "ssh failed with mac $m cipher $c"
                 fi
                 # No point trying all MACs for AEAD ciphers since they
                 # are ignored.
@@ -26,17 +26,3 @@ for c in `${SSH} -Q cipher`; do
         done
 done
 
-if ssh_version 1; then
-        ciphers="3des blowfish"
-else
-        ciphers=""
-fi
-for c in $ciphers; do
-        trace "proto 1 cipher $c"
-        verbose "test $tid: proto 1 cipher $c"
-        ${SSH} -F $OBJ/ssh_proxy -1 -c $c somehost true
-        if [ $? -ne 0 ]; then
-                fail "ssh -1 failed with cipher $c"
-        fi
-done
-