summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/regress/cipher-speed.sh
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssh/regress/cipher-speed.sh')
-rw-r--r--crypto/openssh/regress/cipher-speed.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/openssh/regress/cipher-speed.sh b/crypto/openssh/regress/cipher-speed.sh
index a6d53a7..575dc23 100644
--- a/crypto/openssh/regress/cipher-speed.sh
+++ b/crypto/openssh/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.13 2015/03/24 20:22:17 markus Exp $
# Placed in the Public Domain.
tid="cipher speed"
@@ -25,13 +25,17 @@ for c in `${SSH} -Q cipher`; do n=0; for m in `${SSH} -Q mac`; do
fi
done
# No point trying all MACs for AEAD ciphers since they are ignored.
- if ssh -Q cipher-auth | grep "^${c}\$" >/dev/null 2>&1 ; then
+ if ${SSH} -Q cipher-auth | grep "^${c}\$" >/dev/null 2>&1 ; then
break
fi
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
OpenPOWER on IntegriCloud