RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-18 06:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Account for timeouts in the integrity tests as failures.

If the first test in a series for a given MAC happens to modify the low
bytes of a packet length, then ssh will time out and this will be
interpreted as a test failure.  Patch from cjwatson at debian.org via
bz#2658.

Upstream-Regress-ID: e7467613b0badedaa300bc6fc7495ec2f44e2fb9
This commit is contained in:
dtucker@openbsd.org 2017-01-06 02:26:10 +00:00 committed by Damien Miller
parent dbaf599b61
commit e5c7ec67cd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
regress/integrity.sh
View File

@ -1,12 +1,10 @@
# $OpenBSD: integrity.sh,v 1.19 2016/11/25 02:56:49 dtucker Exp $ # $OpenBSD: integrity.sh,v 1.20 2017/01/06 02:26:10 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="integrity" tid="integrity"
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
# start at byte 2900 (i.e. after kex) and corrupt at different offsets # start at byte 2900 (i.e. after kex) and corrupt at different offsets
# XXX the test hangs if we modify the low bytes of the packet length
# XXX and ssh tries to read...
tries=10 tries=10
startoffset=2900 startoffset=2900
macs=`${SSH} -Q mac` macs=`${SSH} -Q mac`
@ -27,6 +25,7 @@ for m in $macs; do
elen=0 elen=0
epad=0 epad=0
emac=0 emac=0
etmo=0
ecnt=0 ecnt=0
skip=0 skip=0
for off in `jot $tries $startoffset`; do for off in `jot $tries $startoffset`; do