RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 18:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Provide $OBJ to paths in PuTTY interop tests.

Browse Source
This commit is contained in:
Darren Tucker 2018-03-23 13:21:14 +11:00
parent dc31e79454
commit b5974de1a1
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
regress/putty-ciphers.sh
View File

@ -15,7 +15,7 @@ for c in aes 3des aes128-ctr aes192-ctr aes256-ctr ; do
echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c
rm -f ${COPY} 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} cat ${DATA} > ${COPY}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
fail "ssh cat $DATA failed" fail "ssh cat $DATA failed"

2
regress/putty-kex.sh
View File

@ -14,7 +14,7 @@ for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do
${OBJ}/.putty/sessions/kex_$k ${OBJ}/.putty/sessions/kex_$k
echo "KEX=$k" >> ${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 if [ $? -ne 0 ]; then
fail "KEX $k failed" fail "KEX $k failed"
fi fi

4
regress/putty-transfer.sh
View File

@ -15,7 +15,7 @@ for c in 0 1 ; do
${OBJ}/.putty/sessions/compression_$c ${OBJ}/.putty/sessions/compression_$c
echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
env HOME=$PWD ${PLINK} -load compression_$c -batch \ 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 if [ $? -ne 0 ]; then
fail "ssh cat $DATA failed" fail "ssh cat $DATA failed"
fi fi
@ -26,7 +26,7 @@ for c in 0 1 ; do
rm -f ${COPY} rm -f ${COPY}
dd if=$DATA obs=${s} 2> /dev/null | \ dd if=$DATA obs=${s} 2> /dev/null | \
env HOME=$PWD ${PLINK} -load compression_$c \ env HOME=$PWD ${PLINK} -load compression_$c \
-batch -i putty.rsa2 \ -batch -i ${OBJ}/putty.rsa2 \
"cat > ${COPY}" "cat > ${COPY}"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
fail "ssh cat $DATA failed" fail "ssh cat $DATA failed"

3
regress/test-exec.sh
View File

@ -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 "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 echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy
PUTTYDIR=${OBJ}/.putty
export PUTTYDIR
REGRESS_INTEROP_PUTTY=yes REGRESS_INTEROP_PUTTY=yes
fi fi