diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2021-08-31 07:14:00 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2021-08-31 07:14:00 +0000 |
| commit | 013c81d9c3b7c9736e2113233b05ce18824f0136 (patch) | |
| tree | 45eab31fabc4d53726cd46572b193aa1a8b6d9c6 /regress/usr.bin/ssh | |
| parent | 10bb06ccaa65c11441763ce5bbfa4517fe9f751c (diff) | |
Specify path to PuTTY keys. Portable needs this and it makes no
difference on OpenBSD, so resync them.
Diffstat (limited to 'regress/usr.bin/ssh')
| -rw-r--r-- | regress/usr.bin/ssh/putty-ciphers.sh | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/putty-kex.sh | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/putty-transfer.sh | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/regress/usr.bin/ssh/putty-ciphers.sh b/regress/usr.bin/ssh/putty-ciphers.sh index f26b7d8ce52..752aaf90436 100644 --- a/regress/usr.bin/ssh/putty-ciphers.sh +++ b/regress/usr.bin/ssh/putty-ciphers.sh @@ -1,4 +1,4 @@ -# $OpenBSD: putty-ciphers.sh,v 1.8 2021/08/31 06:13:23 dtucker Exp $ +# $OpenBSD: putty-ciphers.sh,v 1.9 2021/08/31 07:13:59 dtucker Exp $ # Placed in the Public Domain. tid="putty ciphers" @@ -20,7 +20,7 @@ for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c rm -f ${COPY} - env HOME=$PWD ${PLINK} -load cipher_$c -batch -i putty.rsa2 \ + env HOME=$PWD ${PLINK} -load cipher_$c -batch -i ${OBJ}/putty.rsa2 \ cat ${DATA} > ${COPY} if [ $? -ne 0 ]; then fail "ssh cat $DATA failed" diff --git a/regress/usr.bin/ssh/putty-kex.sh b/regress/usr.bin/ssh/putty-kex.sh index 87767793479..eb78c0a49a1 100644 --- a/regress/usr.bin/ssh/putty-kex.sh +++ b/regress/usr.bin/ssh/putty-kex.sh @@ -1,4 +1,4 @@ -# $OpenBSD: putty-kex.sh,v 1.6 2021/08/31 06:13:23 dtucker Exp $ +# $OpenBSD: putty-kex.sh,v 1.7 2021/08/31 07:13:59 dtucker Exp $ # Placed in the Public Domain. tid="putty KEX" @@ -19,7 +19,7 @@ for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do ${OBJ}/.putty/sessions/kex_$k echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k - env HOME=$PWD ${PLINK} -load kex_$k -batch -i putty.rsa2 true + env HOME=$PWD ${PLINK} -load kex_$k -batch -i ${OBJ}/putty.rsa2 true if [ $? -ne 0 ]; then fail "KEX $k failed" fi diff --git a/regress/usr.bin/ssh/putty-transfer.sh b/regress/usr.bin/ssh/putty-transfer.sh index 8d5c84f38bf..da6f1e3407d 100644 --- a/regress/usr.bin/ssh/putty-transfer.sh +++ b/regress/usr.bin/ssh/putty-transfer.sh @@ -1,4 +1,4 @@ -# $OpenBSD: putty-transfer.sh,v 1.8 2021/08/31 06:13:23 dtucker Exp $ +# $OpenBSD: putty-transfer.sh,v 1.9 2021/08/31 07:13:59 dtucker Exp $ # Placed in the Public Domain. tid="putty transfer data" @@ -26,7 +26,7 @@ for c in $comp; do ${OBJ}/.putty/sessions/compression_$c echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k env HOME=$PWD ${PLINK} -load compression_$c -batch \ - -i putty.rsa2 cat ${DATA} > ${COPY} + -i ${OBJ}/putty.rsa2 cat ${DATA} > ${COPY} if [ $? -ne 0 ]; then fail "ssh cat $DATA failed" fi @@ -37,7 +37,7 @@ for c in $comp; do rm -f ${COPY} dd if=$DATA obs=${s} 2> /dev/null | \ env HOME=$PWD ${PLINK} -load compression_$c \ - -batch -i putty.rsa2 \ + -batch -i ${OBJ}/putty.rsa2 \ "cat > ${COPY}" if [ $? -ne 0 ]; then fail "ssh cat $DATA failed" |