summaryrefslogtreecommitdiff
path: root/regress/try-ciphers.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-11-07 15:21:19 +1100
committerDarren Tucker <dtucker@zip.com.au>2013-11-07 15:21:19 +1100
commita955041c930e63405159ff7d25ef14272f36eab3 (patch)
tree139a60ab9b18607e959263b6db52dae4573fc37f /regress/try-ciphers.sh
parent06595d639577577bc15d359e037a31eb83563269 (diff)
- dtucker@cvs.openbsd.org 2013/11/07 02:48:38
[regress/integrity.sh regress/cipher-speed.sh regress/try-ciphers.sh] Use ssh -Q instead of hardcoding lists of ciphers or MACs.
Diffstat (limited to 'regress/try-ciphers.sh')
-rw-r--r--regress/try-ciphers.sh22
1 files changed, 3 insertions, 19 deletions
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index e17c9f5e..48584329 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,27 +1,11 @@
-# $OpenBSD: try-ciphers.sh,v 1.20 2013/05/17 10:16:26 dtucker Exp $
+# $OpenBSD: try-ciphers.sh,v 1.21 2013/11/07 02:48:38 dtucker Exp $
# Placed in the Public Domain.
tid="try ciphers"
-ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
- arcfour128 arcfour256 arcfour
- aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
- aes128-ctr aes192-ctr aes256-ctr"
-config_defined OPENSSL_HAVE_EVPGCM && \
- ciphers="$ciphers aes128-gcm@openssh.com aes256-gcm@openssh.com"
-macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
- hmac-sha1-96 hmac-md5-96
- hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com
- umac-64-etm@openssh.com umac-128-etm@openssh.com
- hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com
- hmac-ripemd160-etm@openssh.com"
-config_defined HAVE_EVP_SHA256 &&
- macs="$macs hmac-sha2-256 hmac-sha2-512
- hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com"
-
-for c in $ciphers; do
+for c in `${SSH} -Q cipher`; do
n=0
- for m in $macs; do
+ for m in `${SSH} -Q mac`; do
trace "proto 2 cipher $c mac $m"
verbose "test $tid: proto 2 cipher $c mac $m"
${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true