Provide $OBJ to paths in PuTTY interop tests.

4 files changed, 7 insertions, 4 deletions

diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
index 419daabba..191a2bda8 100644
--- a/regress/putty-ciphers.sh
+++ b/regress/putty-ciphers.sh
@@ -15,7 +15,7 @@ for c in aes 3des aes128-ctr aes192-ctr aes256-ctr ; 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/putty-kex.sh b/regress/putty-kex.sh
index 9d3c6a9f0..71c09701b 100644
--- a/regress/putty-kex.sh
+++ b/regress/putty-kex.sh
@@ -14,7 +14,7 @@ for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; 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/putty-transfer.sh b/regress/putty-transfer.sh
index 50e454cdc..4928d4533 100644
--- a/regress/putty-transfer.sh
+++ b/regress/putty-transfer.sh
@@ -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.rsa2 cat ${DATA} > ${COPY}
+            -i ${OBJ}/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.rsa2 \
+                            -batch -i ${OBJ}/putty.rsa2 \
                             "cat > ${COPY}"
                 if [ $? -ne 0 ]; then
                         fail "ssh cat $DATA failed"
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 46558b057..b6169f157 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -527,6 +527,9 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
         echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy
         echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy
 
+        PUTTYDIR=${OBJ}/.putty
+        export PUTTYDIR
+
         REGRESS_INTEROP_PUTTY=yes
 fi