diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-01-23 11:19:12 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-23 22:34:37 +1100 |
| commit | 415192348a5737a960f6d1b292a17b64d55b542c (patch) | |
| tree | 8d486539ea102e6b3f1fb0ffb919db5b3c0fa2be | |
| parent | fbce7c1a898ae75286349822950682cf46346121 (diff) | |
upstream: Handle zlib compression being disabled now that it's
optional.
OpenBSD-Regress-ID: 0af4fbc5168e62f89d0350de524bff1cb00e707a
| -rw-r--r-- | regress/proxy-connect.sh | 10 | ||||
| -rw-r--r-- | regress/putty-transfer.sh | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/regress/proxy-connect.sh b/regress/proxy-connect.sh index 39bbd3c9..8847fe0c 100644 --- a/regress/proxy-connect.sh +++ b/regress/proxy-connect.sh @@ -1,9 +1,15 @@ -# $OpenBSD: proxy-connect.sh,v 1.11 2017/09/26 22:39:25 dtucker Exp $ +# $OpenBSD: proxy-connect.sh,v 1.12 2020/01/23 11:19:12 dtucker Exp $ # Placed in the Public Domain. tid="proxy connect" -for c in no yes; do +if [ "`${SSH} -Q compression`" = "none" ]; then + comp="no" +else + comp="no yes" +fi + +for c in $comp; do verbose "plain username comp=$c" opts="-oCompression=$c -F $OBJ/ssh_proxy" SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'` diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh index 4928d453..14b41022 100644 --- a/regress/putty-transfer.sh +++ b/regress/putty-transfer.sh @@ -1,4 +1,4 @@ -# $OpenBSD: putty-transfer.sh,v 1.6 2018/02/23 03:03:00 djm Exp $ +# $OpenBSD: putty-transfer.sh,v 1.7 2020/01/23 11:19:12 dtucker Exp $ # Placed in the Public Domain. tid="putty transfer data" @@ -8,7 +8,13 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then exit 0 fi -for c in 0 1 ; do +if [ "`${SSH} -Q compression`" = "none" ]; then + comp="0" +else + comp="0 1" +fi + +for c in $comp; do verbose "$tid: compression $c" rm -f ${COPY} cp ${OBJ}/.putty/sessions/localhost_proxy \ |