upstream commit
eliminate explicit specification of protocol in tests and
loops over protocol. We only support SSHv2 now.
Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd
diff --git a/regress/proto-version.sh b/regress/proto-version.sh
index cf49461..5faeb75 100644
--- a/regress/proto-version.sh
+++ b/regress/proto-version.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: proto-version.sh,v 1.5 2015/03/03 22:35:19 markus Exp $
+# $OpenBSD: proto-version.sh,v 1.6 2017/04/30 23:34:55 djm Exp $
# Placed in the Public Domain.
tid="sshd version with different protocol combinations"
@@ -6,9 +6,8 @@
# we just start sshd in inetd mode and check the banner
check_version ()
{
- version=$1
expect=$2
- banner=`printf '' | ${SSHD} -o "Protocol=${version}" -i -f ${OBJ}/sshd_proxy`
+ banner=`printf '' | ${SSHD} -i -f ${OBJ}/sshd_proxy`
case ${banner} in
SSH-1.99-*)
proto=199
@@ -24,13 +23,8 @@
;;
esac
if [ ${expect} -ne ${proto} ]; then
- fail "wrong protocol version ${banner} for ${version}"
+ fail "wrong protocol version ${banner}"
fi
}
-check_version 2 20
-if ssh_version 1; then
- check_version 2,1 199
- check_version 1,2 199
- check_version 1 15
-fi
+check_version 20