summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2016-03-04 02:48:06 +0000
committerdtucker <dtucker@openbsd.org>2016-03-04 02:48:06 +0000
commit7ddc42819c05fc258ae17aa49a68ce9aee0aac1e (patch)
tree6ea848e027f588efb3c631a3501bb5956ef8e517
parentadd KEX fuzzer harness; ok deraadt@ (diff)
downloadwireguard-openbsd-7ddc42819c05fc258ae17aa49a68ce9aee0aac1e.tar.xz
wireguard-openbsd-7ddc42819c05fc258ae17aa49a68ce9aee0aac1e.zip
Filter debug messages out of log before picking the last two lines.
Should prevent problems if any more debug output is added late in the connection.
-rw-r--r--regress/usr.bin/ssh/integrity.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/integrity.sh b/regress/usr.bin/ssh/integrity.sh
index 36090999afb..98dba772f17 100644
--- a/regress/usr.bin/ssh/integrity.sh
+++ b/regress/usr.bin/ssh/integrity.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: integrity.sh,v 1.17 2016/03/03 00:46:53 dtucker Exp $
+# $OpenBSD: integrity.sh,v 1.18 2016/03/04 02:48:06 dtucker Exp $
# Placed in the Public Domain.
tid="integrity"
@@ -48,7 +48,7 @@ for m in $macs; do
fail "ssh -m $m succeeds with bit-flip at $off"
fi
ecnt=$((ecnt+1))
- out=$(tail -3 $TEST_SSH_LOGFILE | egrep -v "^debug" | \
+ out=$(egrep -v "^debug" $TEST_SSH_LOGFILE | tail -2 | \
tr -s '\r\n' '.')
case "$out" in
Bad?packet*) elen=$((elen+1)); skip=2;;