summaryrefslogtreecommitdiff
path: root/regress/proxy-connect.sh
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 15:08:19 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 15:08:19 +1000
commitd0b69fe90466920d69c96069312e24b581771bd7 (patch)
tree2c924c675ef9363b5ef31489669a4d2d87e64f2c /regress/proxy-connect.sh
parentedb1af50441d19fb2dd9ccb4d75bf14473fca584 (diff)
- dtucker@cvs.openbsd.org 2014/05/03 18:46:14
[proxy-connect.sh] Add tests for with and without compression, with and without privsep.
Diffstat (limited to 'regress/proxy-connect.sh')
-rw-r--r--regress/proxy-connect.sh29
1 files changed, 17 insertions, 12 deletions
diff --git a/regress/proxy-connect.sh b/regress/proxy-connect.sh
index 76e602dd..023ba736 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
-