diff options
Diffstat (limited to 'regress/rekey.sh')
-rw-r--r-- | regress/rekey.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/regress/rekey.sh b/regress/rekey.sh index fe81f0c33..cf9401ea0 100644 --- a/regress/rekey.sh +++ b/regress/rekey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: rekey.sh,v 1.13 2013/11/09 05:41:34 dtucker Exp $ | 1 | # $OpenBSD: rekey.sh,v 1.14 2013/11/21 03:18:51 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="rekey" | 4 | tid="rekey" |
@@ -44,9 +44,9 @@ for opt in $opts; do | |||
44 | ssh_data_rekeying -oRekeyLimit=256k -o$opt | 44 | ssh_data_rekeying -oRekeyLimit=256k -o$opt |
45 | done | 45 | done |
46 | 46 | ||
47 | # GCM is magical so test with all KexAlgorithms | 47 | # AEAD ciphers are magical so test with all KexAlgorithms |
48 | if ${SSH} -Q cipher | grep gcm@openssh.com >/dev/null ; then | 48 | if ${SSH} -Q cipher-auth | grep '^.*$' >/dev/null 2>&1 ; then |
49 | for c in `${SSH} -Q cipher | grep gcm@openssh.com`; do | 49 | for c in `${SSH} -Q cipher-auth`; do |
50 | for kex in `${SSH} -Q kex`; do | 50 | for kex in `${SSH} -Q kex`; do |
51 | verbose "client rekey $c $kex" | 51 | verbose "client rekey $c $kex" |
52 | ssh_data_rekeying -oRekeyLimit=256k -oCiphers=$c -oKexAlgorithms=$kex | 52 | ssh_data_rekeying -oRekeyLimit=256k -oCiphers=$c -oKexAlgorithms=$kex |
@@ -131,10 +131,10 @@ for size in 16 1k 1K 1m 1M 1g 1G; do | |||
131 | awk '/rekeylimit/{print $3}'` | 131 | awk '/rekeylimit/{print $3}'` |
132 | 132 | ||
133 | if [ "$bytes" != "$b" ]; then | 133 | if [ "$bytes" != "$b" ]; then |
134 | fatal "rekeylimit size: expected $bytes got $b" | 134 | fatal "rekeylimit size: expected $bytes bytes got $b" |
135 | fi | 135 | fi |
136 | if [ "$seconds" != "$s" ]; then | 136 | if [ "$seconds" != "$s" ]; then |
137 | fatal "rekeylimit time: expected $time got $s" | 137 | fatal "rekeylimit time: expected $time seconds got $s" |
138 | fi | 138 | fi |
139 | done | 139 | done |
140 | done | 140 | done |