diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | regress/Makefile | 5 | ||||
-rw-r--r-- | regress/kextype.sh | 26 |
3 files changed, 35 insertions, 2 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20101105 | ||
2 | - OpenBSD CVS Sync | ||
3 | - djm@cvs.openbsd.org 2010/09/22 12:26:05 | ||
4 | [regress/Makefile regress/kextype.sh] | ||
5 | regress test for each of the key exchange algorithms that we support | ||
6 | |||
1 | 20101025 | 7 | 20101025 |
2 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with | 8 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with |
3 | 1.12 to unbreak Solaris build. | 9 | 1.12 to unbreak Solaris build. |
diff --git a/regress/Makefile b/regress/Makefile index 9762ab204..f51307f02 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,6 +1,6 @@ | |||
1 | # $OpenBSD: Makefile,v 1.54 2010/06/27 19:19:56 phessler Exp $ | 1 | # $OpenBSD: Makefile,v 1.55 2010/08/31 12:24:25 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
5 | 5 | ||
6 | # Interop tests are not run by default | 6 | # Interop tests are not run by default |
@@ -61,6 +61,7 @@ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers | |||
61 | 61 | ||
62 | USER!= id -un | 62 | USER!= id -un |
63 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | 63 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ |
64 | t8.out t8.out.pub t9.out t9.out.pub \ | ||
64 | authorized_keys_${USER} known_hosts pidfile \ | 65 | authorized_keys_${USER} known_hosts pidfile \ |
65 | ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \ | 66 | ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \ |
66 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ | 67 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ |
diff --git a/regress/kextype.sh b/regress/kextype.sh new file mode 100644 index 000000000..ba6fd9509 --- /dev/null +++ b/regress/kextype.sh | |||
@@ -0,0 +1,26 @@ | |||
1 | # $OpenBSD: kextype.sh,v 1.1 2010/09/22 12:26:05 djm Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="login with different key exchange algorithms" | ||
5 | |||
6 | TIME=/usr/bin/time | ||
7 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak | ||
8 | cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak | ||
9 | |||
10 | kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" | ||
11 | kextypes="$kextypes diffie-hellman-group-exchange-sha256" | ||
12 | kextypes="$kextypes diffie-hellman-group-exchange-sha1" | ||
13 | kextypes="$kextypes diffie-hellman-group14-sha1" | ||
14 | kextypes="$kextypes diffie-hellman-group1-sha1" | ||
15 | |||
16 | tries="1 2 3 4" | ||
17 | for k in $kextypes; do | ||
18 | verbose "kex $k" | ||
19 | for i in $tries; do | ||
20 | ${SSH} -F $OBJ/ssh_proxy -o KexAlgorithms=$k x true | ||
21 | if [ $? -ne 0 ]; then | ||
22 | fail "ssh kex $k" | ||
23 | fi | ||
24 | done | ||
25 | done | ||
26 | |||