summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2014-05-21 07:04:21 +0000
committerdjm <djm@openbsd.org>2014-05-21 07:04:21 +0000
commit4b4f61b44d4ee1a134e233cfbbd1f548cb38b852 (patch)
tree7132e52c61f9cdfbe3e4e3cc9ca6482c3dcc96f4
parentUse errc/warnc to simplify code. (diff)
downloadwireguard-openbsd-4b4f61b44d4ee1a134e233cfbbd1f548cb38b852.tar.xz
wireguard-openbsd-4b4f61b44d4ee1a134e233cfbbd1f548cb38b852.zip
when failing because of unexpected output, show the offending output
-rw-r--r--regress/usr.bin/ssh/integrity.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/integrity.sh b/regress/usr.bin/ssh/integrity.sh
index 2625edc64d6..fdfe76fd25b 100644
--- a/regress/usr.bin/ssh/integrity.sh
+++ b/regress/usr.bin/ssh/integrity.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: integrity.sh,v 1.13 2014/04/21 22:15:37 djm Exp $
+# $OpenBSD: integrity.sh,v 1.14 2014/05/21 07:04:21 djm Exp $
# Placed in the Public Domain.
tid="integrity"
@@ -48,14 +48,14 @@ for m in $macs; do
fail "ssh -m $m succeeds with bit-flip at $off"
fi
ecnt=$((ecnt+1))
- output=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \
+ out=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \
tr -s '\r\n' '.')
- case "$output" in
+ case "$out" in
Bad?packet*) elen=$((elen+1)); skip=2;;
Corrupted?MAC* | Decryption?integrity?check?failed*)
emac=$((emac+1)); skip=0;;
padding*) epad=$((epad+1)); skip=0;;
- *) fail "unexpected error mac $m at $off";;
+ *) fail "unexpected error mac $m at $off: $out";;
esac
done
verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen"