upstream commit

eliminate explicit specification of protocol in tests and
loops over protocol. We only support SSHv2 now.

Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd

1 files changed, 21 insertions, 24 deletions

diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
index 8eb6ae0c0..32c79f9ea 100644
--- a/regress/putty-transfer.sh
+++ b/regress/putty-transfer.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: putty-transfer.sh,v 1.4 2016/11/25 03:02:01 dtucker Exp $
+#       $OpenBSD: putty-transfer.sh,v 1.5 2017/04/30 23:34:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="putty transfer data"
@@ -8,33 +8,30 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
         exit 0
 fi
 
-# XXX support protocol 1 too
-for p in 2; do
-        for c in 0 1 ; do 
-        verbose "$tid: proto $p compression $c"
+for c in 0 1 ; do 
+        verbose "$tid: compression $c"
+        rm -f ${COPY}
+        cp ${OBJ}/.putty/sessions/localhost_proxy \
+            ${OBJ}/.putty/sessions/compression_$c
+        echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
+        env HOME=$PWD ${PLINK} -load compression_$c -batch \
+            -i putty.rsa cat ${DATA} > ${COPY}
+        if [ $? -ne 0 ]; then
+                fail "ssh cat $DATA failed"
+        fi
+        cmp ${DATA} ${COPY}             || fail "corrupted copy"
+
+        for s in 10 100 1k 32k 64k 128k 256k; do
+                trace "compression $c dd-size ${s}"
                 rm -f ${COPY}
-                cp ${OBJ}/.putty/sessions/localhost_proxy \
-                    ${OBJ}/.putty/sessions/compression_$c
-                echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
-                env HOME=$PWD ${PLINK} -load compression_$c -batch \
-                    -i putty.rsa$p cat ${DATA} > ${COPY}
+                dd if=$DATA obs=${s} 2> /dev/null | \
+                        env HOME=$PWD ${PLINK} -load compression_$c \
+                            -batch -i putty.rsa \
+                            "cat > ${COPY}"
                 if [ $? -ne 0 ]; then
                         fail "ssh cat $DATA failed"
                 fi
-                cmp ${DATA} ${COPY}             || fail "corrupted copy"
-        
-                for s in 10 100 1k 32k 64k 128k 256k; do
-                        trace "proto $p compression $c dd-size ${s}"
-                        rm -f ${COPY}
-                        dd if=$DATA obs=${s} 2> /dev/null | \
-                                env HOME=$PWD ${PLINK} -load compression_$c \
-                                    -batch -i putty.rsa$p \
-                                    "cat > ${COPY}"
-                        if [ $? -ne 0 ]; then
-                                fail "ssh cat $DATA failed"
-                        fi
-                        cmp $DATA ${COPY}       || fail "corrupted copy"
-                done
+                cmp $DATA ${COPY}       || fail "corrupted copy"
         done
 done
 rm -f ${COPY}