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) | |
| download | openssh-git-edb1af50441d19fb2dd9ccb4d75bf14473fca584.tar.gz | |
- 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 ac34cedb..2881ce16 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh @@ -1,13 +1,18 @@ -# $OpenBSD: try-ciphers.sh,v 1.22 2013/11/21 03:18:51 djm Exp $ +# $OpenBSD: try-ciphers.sh,v 1.23 2014/04/21 22:15:37 djm Exp $ # Placed in the Public Domain. tid="try ciphers" +cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak + for c in `${SSH} -Q cipher`; do n=0 for m in `${SSH} -Q mac`; do trace "proto 2 cipher $c mac $m" verbose "test $tid: proto 2 cipher $c mac $m" + cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy + echo "Ciphers=$c" >> $OBJ/sshd_proxy + echo "MACs=$m" >> $OBJ/sshd_proxy ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true if [ $? -ne 0 ]; then fail "ssh -2 failed with mac $m cipher $c" |