upstream commit

eliminate explicit specification of protocol in tests and
loops over protocol. We only support SSHv2 now.

Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd

1 files changed, 4 insertions, 8 deletions

diff --git a/regress/proto-mismatch.sh b/regress/proto-mismatch.sh
index 9e8024beb..6ab28c9a7 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