diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-02-17 03:59:00 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-02-17 15:08:29 +1100 |
| commit | 64bbd7444d658ef7ee14a7ea5ccc7f5810279ee7 (patch) | |
| tree | c677ff96d2e58f9eb43e1c5e8704074b9cf5a054 | |
| parent | da0a9afcc446a30ca49dd216612c41ac3cb1f2d4 (diff) | |
upstream: Make sure puttygen is new enough to successfully run the
PuTTY interop tests, otherwise skip them.
OpenBSD-Regress-ID: 34565bb50b8aec58331ed02a5e9e0a9a929bef51
| -rw-r--r-- | regress/test-exec.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index db5d2f9c..11475938 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.76 2020/04/04 23:04:41 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.77 2021/02/17 03:59:00 dtucker Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -601,10 +601,11 @@ if test -x "$CONCH" ; then REGRESS_INTEROP_CONCH=yes fi -# If PuTTY is present and we are running a PuTTY test, prepare keys and -# configuration +# If PuTTY is present, new enough and we are running a PuTTY test, prepare +# keys and configuration. REGRESS_INTEROP_PUTTY=no -if test -x "$PUTTYGEN" -a -x "$PLINK" ; then +if test -x "$PUTTYGEN" -a -x "$PLINK" && + "$PUTTYGEN" --help 2>&1 | grep -- --new-passphrase >/dev/null; then REGRESS_INTEROP_PUTTY=yes fi case "$SCRIPT" in @@ -617,13 +618,13 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then # Add a PuTTY key to authorized_keys rm -f ${OBJ}/putty.rsa2 - if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \ + if ! "$PUTTYGEN" -t rsa -o ${OBJ}/putty.rsa2 \ --random-device=/dev/urandom \ --new-passphrase /dev/null < /dev/null > /dev/null; then - echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2 - puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null + echo "Your installed version of PuTTY is too old to support --new-passphrase, skipping test" >&2 + exit 1 fi - puttygen -O public-openssh ${OBJ}/putty.rsa2 \ + "$PUTTYGEN" -O public-openssh ${OBJ}/putty.rsa2 \ >> $OBJ/authorized_keys_$USER # Convert rsa2 host key to PuTTY format @@ -647,8 +648,6 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then PUTTYDIR=${OBJ}/.putty export PUTTYDIR - - REGRESS_INTEROP_PUTTY=yes fi # create a proxy version of the client config |