summaryrefslogtreecommitdiff
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
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
-rw-r--r--ChangeLog3
-rw-r--r--regress/integrity.sh8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f515b95..be3eacd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,9 @@
[regress/Makefile]
unit tests for new buffer API; including basic fuzz testing
NB. Id sync only.
+ - djm@cvs.openbsd.org 2014/05/21 07:04:21
+ [regress/integrity.sh]
+ when failing because of unexpected output, show the offending output
20140618
- (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 03d80618..d3a489ff 100644
--- a/regress/integrity.sh
+++ b/regress/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"
@@ -54,14 +54,14 @@ for m in $macs; do
fail "ssh -m $m succeeds with bit-flip at $off"
fi
ecnt=`expr $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=`expr $elen + 1`; skip=3;;
Corrupted?MAC* | Decryption?integrity?check?failed*)
emac=`expr $emac + 1`; skip=0;;
padding*) epad=`expr $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"