diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-02-23 03:03:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-02-23 14:07:23 +1100 |
commit | 73282b61187883a2b2bb48e087fdda1d751d6059 (patch) | |
tree | 09d6c2f9fefa898e83bbbf31456b61d896980ffd | |
parent | f8985dde5f46aedade0373365cbf86ed3f1aead2 (diff) |
upstream: unbreak interop test after SSHv1 purge; patch from Colin
Watson via bz#2823
OpenBSD-Regress-ID: 807d30a597756ed6612bdf46dfebca74f49cb31a
-rw-r--r-- | regress/putty-transfer.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh index 32c79f9ea..50e454cdc 100644 --- a/regress/putty-transfer.sh +++ b/regress/putty-transfer.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: putty-transfer.sh,v 1.5 2017/04/30 23:34:55 djm Exp $ | 1 | # $OpenBSD: putty-transfer.sh,v 1.6 2018/02/23 03:03:00 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="putty transfer data" | 4 | tid="putty transfer data" |
@@ -15,7 +15,7 @@ for c in 0 1 ; do | |||
15 | ${OBJ}/.putty/sessions/compression_$c | 15 | ${OBJ}/.putty/sessions/compression_$c |
16 | echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k | 16 | echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k |
17 | env HOME=$PWD ${PLINK} -load compression_$c -batch \ | 17 | env HOME=$PWD ${PLINK} -load compression_$c -batch \ |
18 | -i putty.rsa cat ${DATA} > ${COPY} | 18 | -i putty.rsa2 cat ${DATA} > ${COPY} |
19 | if [ $? -ne 0 ]; then | 19 | if [ $? -ne 0 ]; then |
20 | fail "ssh cat $DATA failed" | 20 | fail "ssh cat $DATA failed" |
21 | fi | 21 | fi |
@@ -26,7 +26,7 @@ for c in 0 1 ; do | |||
26 | rm -f ${COPY} | 26 | rm -f ${COPY} |
27 | dd if=$DATA obs=${s} 2> /dev/null | \ | 27 | dd if=$DATA obs=${s} 2> /dev/null | \ |
28 | env HOME=$PWD ${PLINK} -load compression_$c \ | 28 | env HOME=$PWD ${PLINK} -load compression_$c \ |
29 | -batch -i putty.rsa \ | 29 | -batch -i putty.rsa2 \ |
30 | "cat > ${COPY}" | 30 | "cat > ${COPY}" |
31 | if [ $? -ne 0 ]; then | 31 | if [ $? -ne 0 ]; then |
32 | fail "ssh cat $DATA failed" | 32 | fail "ssh cat $DATA failed" |