- dtucker@cvs.openbsd.org 2014/05/03 18:46:14

     [proxy-connect.sh]
     Add tests for with and without compression, with and without privsep.

2 files changed, 20 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c5d8701e..355343398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,6 +102,9 @@
      repair regress tests broken by server-side default cipher/kex/mac changes
      by ensuring that the option under test is included in the server's
      algorithm list
+   - dtucker@cvs.openbsd.org 2014/05/03 18:46:14
+     [proxy-connect.sh]
+     Add tests for with and without compression, with and without privsep.
 
 20140430
  - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
diff --git a/regress/proxy-connect.sh b/regress/proxy-connect.sh
index 76e602dd6..023ba7367 100644
--- a/regress/proxy-connect.sh
+++ b/regress/proxy-connect.sh
@@ -1,26 +1,31 @@
-#       $OpenBSD: proxy-connect.sh,v 1.6 2013/03/07 00:20:34 djm Exp $
+#       $OpenBSD: proxy-connect.sh,v 1.7 2014/05/03 18:46:14 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="proxy connect"
 
-verbose "plain username"
-for p in 1 2; do
-        ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
-        if [ $? -ne 0 ]; then
-                fail "ssh proxyconnect protocol $p failed"
-        fi
-        SSH_CONNECTION=`${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 'echo $SSH_CONNECTION'`
+mv $OBJ/sshd_proxy $OBJ/sshd_proxy.orig
+
+for ps in no yes; do
+  cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
+  echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy
+
+  for p in 1 2; do
+    for c in no yes; do
+        verbose "plain username protocol $p privsep=$ps comp=$c"
+        opts="-$p -oCompression=$c -F $OBJ/ssh_proxy"
+        SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'`
         if [ $? -ne 0 ]; then
-                fail "ssh proxyconnect protocol $p failed"
+                fail "ssh proxyconnect protocol $p privsep=$ps comp=$c failed"
         fi
         if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then
-                fail "bad SSH_CONNECTION"
+                fail "bad SSH_CONNECTION protocol $p privsep=$ps comp=$c"
         fi
+    done
+  done
 done
 
-verbose "username with style"
 for p in 1 2; do
+        verbose "username with style protocol $p"
         ${SSH} -$p -F $OBJ/ssh_proxy ${USER}:style@999.999.999.999 true || \
                 fail "ssh proxyconnect protocol $p failed"
 done
-