diff options
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 68f010b70..b6169f157 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.61 2017/07/28 10:32:08 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.62 2018/03/16 09:06:31 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -503,6 +503,7 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then | |||
503 | # Add a PuTTY key to authorized_keys | 503 | # Add a PuTTY key to authorized_keys |
504 | rm -f ${OBJ}/putty.rsa2 | 504 | rm -f ${OBJ}/putty.rsa2 |
505 | if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \ | 505 | if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \ |
506 | --random-device=/dev/urandom \ | ||
506 | --new-passphrase /dev/null < /dev/null > /dev/null; then | 507 | --new-passphrase /dev/null < /dev/null > /dev/null; then |
507 | echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2 | 508 | echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2 |
508 | puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null | 509 | puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null |
@@ -526,6 +527,9 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then | |||
526 | echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy | 527 | echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy |
527 | echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy | 528 | echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy |
528 | 529 | ||
530 | PUTTYDIR=${OBJ}/.putty | ||
531 | export PUTTYDIR | ||
532 | |||
529 | REGRESS_INTEROP_PUTTY=yes | 533 | REGRESS_INTEROP_PUTTY=yes |
530 | fi | 534 | fi |
531 | 535 | ||