diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-03-03 22:35:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-03-05 05:59:47 +1100 |
commit | dad2b1892b4c1b7e58df483a8c5b983c4454e099 (patch) | |
tree | fa461e273ef92414c934a88cc88b2875032e616f /regress/cipher-speed.sh | |
parent | d48a22601bdd3eec054794c535f4ae8d8ae4c6e2 (diff) | |
download | openssh-git-dad2b1892b4c1b7e58df483a8c5b983c4454e099.tar.gz |
upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
Diffstat (limited to 'regress/cipher-speed.sh')
-rw-r--r-- | regress/cipher-speed.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index a6d53a78..ad2f9b90 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh @@ -1,4 +1,4 @@ -# $OpenBSD: cipher-speed.sh,v 1.11 2013/11/21 03:18:51 djm Exp $ +# $OpenBSD: cipher-speed.sh,v 1.12 2015/03/03 22:35:19 markus Exp $ # Placed in the Public Domain. tid="cipher speed" @@ -31,7 +31,11 @@ for c in `${SSH} -Q cipher`; do n=0; for m in `${SSH} -Q mac`; do n=`expr $n + 1` done; done -ciphers="3des blowfish" +if ssh_version 1; then + ciphers="3des blowfish" +else + ciphers="" +fi for c in $ciphers; do trace "proto 1 cipher $c" for x in $tries; do |