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

Merge integrity.sh rev 1.22. 

Merge missing bits from Colin Watson's patch in bz#2658 which make integrity
tests more robust against timeouts.  ok djm@
This commit is contained in:
Darren Tucker 2017-04-28 14:33:43 +10:00
parent 06ec837a34
commit 9504ea6b27
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
regress/integrity.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: integrity.sh,v 1.21 2017/04/28 04:00:14 dtucker Exp $ # $OpenBSD: integrity.sh,v 1.22 2017/04/28 04:16:27 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="integrity" tid="integrity"
@ -60,14 +60,16 @@ for m in $macs; do
Corrupted?MAC* | *message?authentication?code?incorrect*) Corrupted?MAC* | *message?authentication?code?incorrect*)
emac=`expr $emac + 1`; skip=0;; emac=`expr $emac + 1`; skip=0;;
padding*) epad=`expr $epad + 1`; skip=0;; padding*) epad=`expr $epad + 1`; skip=0;;
*Timeout,?server*)
etmo=`expr $etmo + 1`; skip=0;;
*) fail "unexpected error mac $m at $off: $out";; *) fail "unexpected error mac $m at $off: $out";;
esac esac
done done
verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen" verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen timeout $etmo"
if [ $emac -eq 0 ]; then if [ $emac -eq 0 ]; then
fail "$m: no mac errors" fail "$m: no mac errors"
fi fi
expect=`expr $ecnt - $epad - $elen` expect=`expr $ecnt - $epad - $elen - $etmo`
if [ $emac -ne $expect ]; then if [ $emac -ne $expect ]; then
fail "$m: expected $expect mac errors, got $emac" fail "$m: expected $expect mac errors, got $emac"
fi fi