diff options
author | Damien Miller <djm@mindrot.org> | 2014-05-15 15:07:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-05-15 15:07:53 +1000 |
commit | edb1af50441d19fb2dd9ccb4d75bf14473fca584 (patch) | |
tree | c07867fd0c92fdda87b3b5005ce4d14b39f7bc06 /regress/try-ciphers.sh | |
parent | 54343e95c70994695f8842fb22836321350198d3 (diff) |
- djm@cvs.openbsd.org 2014/04/21 22:15:37
[dhgex.sh integrity.sh kextype.sh rekey.sh try-ciphers.sh]
repair regress tests broken by server-side default cipher/kex/mac changes
by ensuring that the option under test is included in the server's
algorithm list
Diffstat (limited to 'regress/try-ciphers.sh')
-rw-r--r-- | regress/try-ciphers.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index ac34cedbf..2881ce16c 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
@@ -1,13 +1,18 @@ | |||
1 | # $OpenBSD: try-ciphers.sh,v 1.22 2013/11/21 03:18:51 djm Exp $ | 1 | # $OpenBSD: try-ciphers.sh,v 1.23 2014/04/21 22:15:37 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="try ciphers" | 4 | tid="try ciphers" |
5 | 5 | ||
6 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak | ||
7 | |||
6 | for c in `${SSH} -Q cipher`; do | 8 | for c in `${SSH} -Q cipher`; do |
7 | n=0 | 9 | n=0 |
8 | for m in `${SSH} -Q mac`; do | 10 | for m in `${SSH} -Q mac`; do |
9 | trace "proto 2 cipher $c mac $m" | 11 | trace "proto 2 cipher $c mac $m" |
10 | verbose "test $tid: proto 2 cipher $c mac $m" | 12 | verbose "test $tid: proto 2 cipher $c mac $m" |
13 | cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy | ||
14 | echo "Ciphers=$c" >> $OBJ/sshd_proxy | ||
15 | echo "MACs=$m" >> $OBJ/sshd_proxy | ||
11 | ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true | 16 | ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true |
12 | if [ $? -ne 0 ]; then | 17 | if [ $? -ne 0 ]; then |
13 | fail "ssh -2 failed with mac $m cipher $c" | 18 | fail "ssh -2 failed with mac $m cipher $c" |