summaryrefslogtreecommitdiff
path: root/regress/try-ciphers.sh
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-21 14:26:18 +1100
committerDamien Miller <djm@mindrot.org>2013-11-21 14:26:18 +1100
commit8a073cf57940aabf85e49799f89f5d5e9b072c1b (patch)
tree2446191d561babc47ccbeda447c0223bd4803dcb /regress/try-ciphers.sh
parentea61b2179f63d48968dd2c9617621002bb658bfe (diff)
- djm@cvs.openbsd.org 2013/11/21 03:18:51
[regress/cipher-speed.sh regress/integrity.sh regress/rekey.sh] [regress/try-ciphers.sh] use new "ssh -Q cipher-auth" query to obtain lists of authenticated encryption ciphers instead of specifying them manually; ensures that the new chacha20poly1305@openssh.com mode is tested; ok markus@ and naddy@ as part of the diff to add chacha20poly1305@openssh.com
Diffstat (limited to 'regress/try-ciphers.sh')
-rw-r--r--regress/try-ciphers.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 48584329..ac34cedb 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: try-ciphers.sh,v 1.21 2013/11/07 02:48:38 dtucker Exp $
+# $OpenBSD: try-ciphers.sh,v 1.22 2013/11/21 03:18:51 djm Exp $
# Placed in the Public Domain.
tid="try ciphers"
@@ -12,10 +12,11 @@ for c in `${SSH} -Q cipher`; do
if [ $? -ne 0 ]; then
fail "ssh -2 failed with mac $m cipher $c"
fi
- # No point trying all MACs for GCM since they are ignored.
- case $c in
- aes*-gcm@openssh.com) test $n -gt 0 && break;;
- esac
+ # No point trying all MACs for AEAD ciphers since they
+ # are ignored.
+ if ssh -Q cipher-auth | grep "^${c}\$" >/dev/null 2>&1 ; then
+ break
+ fi
n=`expr $n + 1`
done
done