]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: unbreak interop test after SSHv1 purge; patch from Colin
authordjm@openbsd.org <djm@openbsd.org>
Fri, 23 Feb 2018 03:03:00 +0000 (03:03 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 23 Feb 2018 03:07:23 +0000 (14:07 +1100)
Watson via bz#2823

OpenBSD-Regress-ID: 807d30a597756ed6612bdf46dfebca74f49cb31a

regress/putty-transfer.sh

index 32c79f9ea4b91cdb46d10b7aae987e337585ffb0..50e454cdc25f88ccdb0570e02a4d9cc01759ea2e 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: putty-transfer.sh,v 1.5 2017/04/30 23:34:55 djm Exp $
+#      $OpenBSD: putty-transfer.sh,v 1.6 2018/02/23 03:03:00 djm Exp $
 #      Placed in the Public Domain.
 
 tid="putty transfer data"
@@ -15,7 +15,7 @@ for c in 0 1 ; do
            ${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}
+           -i putty.rsa2 cat ${DATA} > ${COPY}
        if [ $? -ne 0 ]; then
                fail "ssh cat $DATA failed"
        fi
@@ -26,7 +26,7 @@ for c in 0 1 ; do
                rm -f ${COPY}
                dd if=$DATA obs=${s} 2> /dev/null | \
                        env HOME=$PWD ${PLINK} -load compression_$c \
-                           -batch -i putty.rsa \
+                           -batch -i putty.rsa2 \
                            "cat > ${COPY}"
                if [ $? -ne 0 ]; then
                        fail "ssh cat $DATA failed"