summaryrefslogtreecommitdiff
path: root/regress/proto-mismatch.sh
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:34:55 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 11:59:42 +1000
commitdd369320d2435b630a5974ab270d686dcd92d024 (patch)
tree97ae4bb34d835fbafad12180862195a9e9192d28 /regress/proto-mismatch.sh
parent557f921aad004be15805e09fd9572969eb3d9321 (diff)
upstream commit
eliminate explicit specification of protocol in tests and loops over protocol. We only support SSHv2 now. Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd
Diffstat (limited to 'regress/proto-mismatch.sh')
-rw-r--r--regress/proto-mismatch.sh12
1 files changed, 4 insertions, 8 deletions
diff --git a/regress/proto-mismatch.sh b/regress/proto-mismatch.sh
index 9e8024be..6ab28c9a 100644
--- a/regress/proto-mismatch.sh
+++ b/regress/proto-mismatch.sh
@@ -1,21 +1,17 @@
-# $OpenBSD: proto-mismatch.sh,v 1.4 2015/03/03 22:35:19 markus Exp $
+# $OpenBSD: proto-mismatch.sh,v 1.5 2017/04/30 23:34:55 djm Exp $
# Placed in the Public Domain.
tid="protocol version mismatch"
mismatch ()
{
- server=$1
client=$2
- banner=`echo ${client} | ${SSHD} -o "Protocol=${server}" -i -f ${OBJ}/sshd_proxy`
+ banner=`echo ${client} | ${SSHD} -i -f ${OBJ}/sshd_proxy`
r=$?
trace "sshd prints ${banner}"
if [ $r -ne 255 ]; then
- fail "sshd prints ${banner} and accepts connect with version ${client}"
+ fail "sshd prints ${banner} but accepts version ${client}"
fi
}
-mismatch 2 SSH-1.5-HALLO
-if ssh_version 1; then
- mismatch 1 SSH-2.0-HALLO
-fi
+mismatch SSH-1.5-HALLO