summaryrefslogtreecommitdiff
path: root/regress/integrity.sh
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-02 17:01:08 +1000
committerDamien Miller <djm@mindrot.org>2014-07-02 17:01:08 +1000
commit43d3ed2dd3feca6d0326c7dc82588d2faa115e92 (patch)
treec73ba632c70e38c880af92e97d7cce713fcf9715 /regress/integrity.sh
parent5a96707ffc8d227c2e7d94fa6b0317f8a152cf4e (diff)
- djm@cvs.openbsd.org 2014/05/21 07:04:21
[regress/integrity.sh] when failing because of unexpected output, show the offending output
Diffstat (limited to 'regress/integrity.sh')
-rw-r--r--regress/integrity.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 03d80618c..d3a489ff7 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: integrity.sh,v 1.13 2014/04/21 22:15:37 djm Exp $ 1# $OpenBSD: integrity.sh,v 1.14 2014/05/21 07:04:21 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="integrity" 4tid="integrity"
@@ -54,14 +54,14 @@ for m in $macs; do
54 fail "ssh -m $m succeeds with bit-flip at $off" 54 fail "ssh -m $m succeeds with bit-flip at $off"
55 fi 55 fi
56 ecnt=`expr $ecnt + 1` 56 ecnt=`expr $ecnt + 1`
57 output=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ 57 out=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \
58 tr -s '\r\n' '.') 58 tr -s '\r\n' '.')
59 case "$output" in 59 case "$out" in
60 Bad?packet*) elen=`expr $elen + 1`; skip=3;; 60 Bad?packet*) elen=`expr $elen + 1`; skip=3;;
61 Corrupted?MAC* | Decryption?integrity?check?failed*) 61 Corrupted?MAC* | Decryption?integrity?check?failed*)
62 emac=`expr $emac + 1`; skip=0;; 62 emac=`expr $emac + 1`; skip=0;;
63 padding*) epad=`expr $epad + 1`; skip=0;; 63 padding*) epad=`expr $epad + 1`; skip=0;;
64 *) fail "unexpected error mac $m at $off";; 64 *) fail "unexpected error mac $m at $off: $out";;
65 esac 65 esac
66 done 66 done
67 verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen" 67 verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen"