Mailing List Archive

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit e5c7ec67cdc42ae2584085e0fc5cc5ee91133cf5
Author: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri Jan 6 02:26:10 2017 +0000

upstream commit

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
---
regress/integrity.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/regress/integrity.sh b/regress/integrity.sh
index 39d310d..1df2924 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -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.

tid="integrity"
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak

# 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
startoffset=2900
macs=`${SSH} -Q mac`
@@ -27,6 +25,7 @@ for m in $macs; do
elen=0
epad=0
emac=0
+ etmo=0
ecnt=0
skip=0
for off in `jot $tries $startoffset`; do

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits