upstream: Handle zlib compression being disabled now that it's

optional.

OpenBSD-Regress-ID: 0af4fbc5168e62f89d0350de524bff1cb00e707a

diff --git a/regress/proxy-connect.sh b/regress/proxy-connect.sh
index 39bbd3c96e76474290fb62c696eb0f7f21b02099..8847fe0c664b825ec5a1e024aa6f494969cda3bd 100644 (file)
--- 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 4928d4533f6b628388306552b379e8251c02a9af..14b41022f8a6c90e3c3ee7cd9936a897ca06041e 100644 (file)
--- 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 \