Import openssh_7.6p1.orig.tar.gz

1 files changed, 4 insertions, 23 deletions

diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index 575dc2341..5da95b3a9 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: cipher-speed.sh,v 1.13 2015/03/24 20:22:17 markus Exp $
+#       $OpenBSD: cipher-speed.sh,v 1.14 2017/04/30 23:34:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="cipher speed"
@@ -12,16 +12,16 @@ getbytes ()
 tries="1 2"
 
 for c in `${SSH} -Q cipher`; do n=0; for m in `${SSH} -Q mac`; do
-        trace "proto 2 cipher $c mac $m"
+        trace "cipher $c mac $m"
         for x in $tries; do
                 printf "%-60s" "$c/$m:"
                 ( ${SSH} -o 'compression no' \
-                        -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \
+                        -F $OBJ/ssh_proxy -m $m -c $c somehost \
                         exec sh -c \'"dd of=/dev/null obs=32k"\' \
                 < ${DATA} ) 2>&1 | getbytes
 
                 if [ $? -ne 0 ]; then
-                        fail "ssh -2 failed with mac $m cipher $c"
+                        fail "ssh failed with mac $m cipher $c"
                 fi
         done
         # No point trying all MACs for AEAD ciphers since they are ignored.
@@ -30,22 +30,3 @@ for c in `${SSH} -Q cipher`; do n=0; for m in `${SSH} -Q mac`; do
         fi
         n=`expr $n + 1`
 done; done
-
-if ssh_version 1; then
-        ciphers="3des blowfish"
-else
-        ciphers=""
-fi
-for c in $ciphers; do
-        trace "proto 1 cipher $c"
-        for x in $tries; do
-                printf "%-60s" "$c:"
-                ( ${SSH} -o 'compression no' \
-                        -F $OBJ/ssh_proxy -1 -c $c somehost \
-                        exec sh -c \'"dd of=/dev/null obs=32k"\' \
-                < ${DATA} ) 2>&1 | getbytes
-                if [ $? -ne 0 ]; then
-                        fail "ssh -1 failed with cipher $c"
-                fi
-        done
-done