tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
dtucker@openbsd.org 2016-03-04 02:48:06 +00:00 committed by Damien Miller
parent 0892edaa3c
commit 331b8e07ee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regress/integrity.sh
View File

@ -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. # Placed in the Public Domain.
tid="integrity" tid="integrity"
@ -54,7 +54,7 @@ for m in $macs; do
fail "ssh -m $m succeeds with bit-flip at $off" fail "ssh -m $m succeeds with bit-flip at $off"
fi fi
ecnt=`expr $ecnt + 1` 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' '.') tr -s '\r\n' '.')
case "$out" in case "$out" in
Bad?packet*) elen=`expr $elen + 1`; skip=3;; Bad?packet*) elen=`expr $elen + 1`; skip=3;;