diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-03-03 00:46:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-03-04 15:12:22 +1100 |
commit | ae2562c47d41b68dbb00240fd6dd60bed205367a (patch) | |
tree | e6cb01bd9d6c177199cfd379273e4041f8125ceb /regress | |
parent | 988e429d903acfb298bfddfd75e7994327adfed0 (diff) |
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
Diffstat (limited to 'regress')
-rw-r--r-- | regress/integrity.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
1 | # $OpenBSD: integrity.sh,v 1.16 2015/03/24 20:22:17 markus Exp $ | 1 | # $OpenBSD: integrity.sh,v 1.17 2016/03/03 00:46:53 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="integrity" | 4 | tid="integrity" |
@@ -54,7 +54,7 @@ for m in $macs; do | |||
54 | fail "ssh -m $m succeeds with bit-flip at $off" | 54 | fail "ssh -m $m succeeds with bit-flip at $off" |
55 | fi | 55 | fi |
56 | ecnt=`expr $ecnt + 1` | 56 | ecnt=`expr $ecnt + 1` |
57 | out=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ | 57 | out=$(tail -3 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ |
58 | tr -s '\r\n' '.') | 58 | tr -s '\r\n' '.') |
59 | case "$out" in | 59 | case "$out" in |
60 | Bad?packet*) elen=`expr $elen + 1`; skip=3;; | 60 | Bad?packet*) elen=`expr $elen + 1`; skip=3;; |