diff options
| author |   dtucker <dtucker@openbsd.org> | 2013-11-07 03:55:41 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2013-11-07 03:55:41 +0000 |
| commit | d399ad7d45364816a13b9acbed88491a64edaecb (patch) | |
| tree | 1603ca69b7c103d606f8c99ba5b62de7e23fa1f1 | |
| parent | Use ssh -Q instead of hardcoding lists of ciphers or MACs. (diff) | |
| download | wireguard-openbsd-d399ad7d45364816a13b9acbed88491a64edaecb.tar.xz wireguard-openbsd-d399ad7d45364816a13b9acbed88491a64edaecb.zip | |
Use ssh -Q to get kex types instead of a static list.
| -rw-r--r-- | regress/usr.bin/ssh/kextype.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/regress/usr.bin/ssh/kextype.sh b/regress/usr.bin/ssh/kextype.sh index 0ce9f9206f2..278c73e58d8 100644 --- a/regress/usr.bin/ssh/kextype.sh +++ b/regress/usr.bin/ssh/kextype.sh @@ -1,4 +1,4 @@ -# $OpenBSD: kextype.sh,v 1.2 2013/11/02 22:39:53 markus Exp $ +# $OpenBSD: kextype.sh,v 1.3 2013/11/07 03:55:41 dtucker Exp $ # Placed in the Public Domain. tid="login with different key exchange algorithms" @@ -7,15 +7,8 @@ TIME=/usr/bin/time cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak -kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" -kextypes="$kextypes diffie-hellman-group-exchange-sha256" -kextypes="$kextypes diffie-hellman-group-exchange-sha1" -kextypes="$kextypes diffie-hellman-group14-sha1" -kextypes="$kextypes diffie-hellman-group1-sha1" -kextypes="$kextypes curve25519-sha256@libssh.org" - 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 |