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

diff --git a/regress/integrity.sh b/regress/integrity.sh
index 1d4976771a25eadde6f441ea7b8ee358af63c1f5..6acbe4fc0fd6a4157229761e941e610bbf873ce8 100644 (file)
--- 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;;