From ae2562c47d41b68dbb00240fd6dd60bed205367a Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Thu, 3 Mar 2016 00:46:53 +0000 Subject: upstream commit Look back 3 lines for possible error messages. Changes to the code mean that "Bad packet length" errors are 3 lines back instead of the previous two, which meant we didn't skip some offsets that we intended to. Upstream-Regress-ID: 24f36912740a634d509a3144ebc8eb7c09b9c684 --- regress/integrity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'regress/integrity.sh') diff --git a/regress/integrity.sh b/regress/integrity.sh index 1d4976771..6acbe4fc0 100644 --- a/regress/integrity.sh +++ b/regress/integrity.sh @@ -1,4 +1,4 @@ -# $OpenBSD: integrity.sh,v 1.16 2015/03/24 20:22:17 markus Exp $ +# $OpenBSD: integrity.sh,v 1.17 2016/03/03 00:46:53 dtucker Exp $ # Placed in the Public Domain. tid="integrity" @@ -54,7 +54,7 @@ for m in $macs; do fail "ssh -m $m succeeds with bit-flip at $off" fi ecnt=`expr $ecnt + 1` - out=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ + out=$(tail -3 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ tr -s '\r\n' '.') case "$out" in Bad?packet*) elen=`expr $elen + 1`; skip=3;; -- cgit v1.2.3 From 331b8e07ee5bcbdca12c11cc8f51a7e8de09b248 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 4 Mar 2016 02:48:06 +0000 Subject: upstream commit 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. Upstream-Regress-ID: 345d0a9589c381e7d640a4ead06cfaadf4db1363 --- regress/integrity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'regress/integrity.sh') diff --git a/regress/integrity.sh b/regress/integrity.sh index 6acbe4fc0..bfadc6b48 100644 --- a/regress/integrity.sh +++ b/regress/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" @@ -54,7 +54,7 @@ for m in $macs; do fail "ssh -m $m succeeds with bit-flip at $off" fi ecnt=`expr $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=`expr $elen + 1`; skip=3;; -- cgit v1.2.3