summaryrefslogtreecommitdiff
path: root/regress/kextype.sh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/kextype.sh')
-rw-r--r--regress/kextype.sh14
1 files changed, 2 insertions, 12 deletions
diff --git a/regress/kextype.sh b/regress/kextype.sh
index 79c0817b..8c2ac09d 100644
--- a/regress/kextype.sh
+++ b/regress/kextype.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: kextype.sh,v 1.1 2010/09/22 12:26:05 djm Exp $
+# $OpenBSD: kextype.sh,v 1.4 2013/11/07 04:26:56 dtucker Exp $
# Placed in the Public Domain.
tid="login with different key exchange algorithms"
@@ -7,18 +7,8 @@ TIME=/usr/bin/time
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
-if test "$TEST_SSH_ECC" = "yes"; then
- kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521"
-fi
-if test "$TEST_SSH_SHA256" = "yes"; then
- kextypes="$kextypes diffie-hellman-group-exchange-sha256"
-fi
-kextypes="$kextypes diffie-hellman-group-exchange-sha1"
-kextypes="$kextypes diffie-hellman-group14-sha1"
-kextypes="$kextypes diffie-hellman-group1-sha1"
-
tries="1 2 3 4"
-for k in $kextypes; do
+for k in `${SSH} -Q kex`; do
verbose "kex $k"
for i in $tries; do
${SSH} -F $OBJ/ssh_proxy -o KexAlgorithms=$k x true