RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2013/11/07 03:55:41 

[regress/kextype.sh]
     Use ssh -Q to get kex types instead of a static list.
This commit is contained in:
Darren Tucker 2013-11-07 15:26:12 +11:00
parent a955041c93
commit 74cbc22529
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -37,6 +37,9 @@
- dtucker@cvs.openbsd.org 2013/11/07 02:48:38 - dtucker@cvs.openbsd.org 2013/11/07 02:48:38
[regress/integrity.sh regress/cipher-speed.sh regress/try-ciphers.sh] [regress/integrity.sh regress/cipher-speed.sh regress/try-ciphers.sh]
Use ssh -Q instead of hardcoding lists of ciphers or MACs. Use ssh -Q instead of hardcoding lists of ciphers or MACs.
- dtucker@cvs.openbsd.org 2013/11/07 03:55:41
[regress/kextype.sh]
Use ssh -Q to get kex types instead of a static list.
20131104 20131104
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

15
regress/kextype.sh
View File

@ -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. # Placed in the Public Domain.
tid="login with different key exchange algorithms" tid="login with different key exchange algorithms"
@ -7,19 +7,8 @@ TIME=/usr/bin/time
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
cp $OBJ/ssh_proxy $OBJ/ssh_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"
kextypes="$kextypes curve25519-sha256@libssh.org"
tries="1 2 3 4" tries="1 2 3 4"
for k in $kextypes; do for k in `${SSH} -Q kex`; do
verbose "kex $k" verbose "kex $k"
for i in $tries; do for i in $tries; do
${SSH} -F $OBJ/ssh_proxy -o KexAlgorithms=$k x true ${SSH} -F $OBJ/ssh_proxy -o KexAlgorithms=$k x true