summaryrefslogtreecommitdiff
path: root/regress/test-exec.sh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r--regress/test-exec.sh26
1 files changed, 3 insertions, 23 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index dc033cd9..1480f13f 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.59 2017/02/07 23:03:11 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.60 2017/04/30 23:34:55 djm Exp $
# Placed in the Public Domain.
#SUDO=sudo
@@ -130,12 +130,6 @@ if [ "x$TEST_SSH_CONCH" != "x" ]; then
esac
fi
-SSH_PROTOCOLS=2
-#SSH_PROTOCOLS=`$SSH -Q protocol-version`
-if [ "x$TEST_SSH_PROTOCOLS" != "x" ]; then
- SSH_PROTOCOLS="${TEST_SSH_PROTOCOLS}"
-fi
-
# Path to sshd must be absolute for rexec
case "$SSHD" in
/*) ;;
@@ -386,22 +380,11 @@ fatal ()
exit $RESULT
}
-ssh_version ()
-{
- echo ${SSH_PROTOCOLS} | grep "$1" >/dev/null
-}
-
RESULT=0
PIDFILE=$OBJ/pidfile
trap fatal 3 2
-if ssh_version 1; then
- PROTO="2,1"
-else
- PROTO="2"
-fi
-
# create server config
cat << EOF > $OBJ/sshd_config
StrictModes no
@@ -460,11 +443,8 @@ fi
rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER
-if ssh_version 1; then
- SSH_KEYTYPES="rsa rsa1"
-else
- SSH_KEYTYPES="rsa ed25519"
-fi
+SSH_KEYTYPES="rsa ed25519"
+
trace "generate keys"
for t in ${SSH_KEYTYPES}; do
# generate user key