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