diff options
Diffstat (limited to 'debian/patches/regress-integrity-robust.patch')
-rw-r--r-- | debian/patches/regress-integrity-robust.patch | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/debian/patches/regress-integrity-robust.patch b/debian/patches/regress-integrity-robust.patch index 651a7a88e..2c515e317 100644 --- a/debian/patches/regress-integrity-robust.patch +++ b/debian/patches/regress-integrity-robust.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7ce93c802065cd926e7cbfd10e629f3a2d352301 Mon Sep 17 00:00:00 2001 | 1 | From c210daa1ae77904f57478315e75af3f82a5d69f2 Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 1 Jan 2017 15:21:10 +0000 | 3 | Date: Sun, 1 Jan 2017 15:21:10 +0000 |
4 | Subject: Make integrity tests more robust against timeouts | 4 | Subject: Make integrity tests more robust against timeouts |
@@ -12,31 +12,14 @@ Patch-Name: regress-integrity-robust.patch | |||
12 | 12 | ||
13 | Last-Update: 2017-01-01 | 13 | Last-Update: 2017-01-01 |
14 | --- | 14 | --- |
15 | regress/integrity.sh | 9 +++++---- | 15 | regress/integrity.sh | 6 ++++-- |
16 | 1 file changed, 5 insertions(+), 4 deletions(-) | 16 | 1 file changed, 4 insertions(+), 2 deletions(-) |
17 | 17 | ||
18 | diff --git a/regress/integrity.sh b/regress/integrity.sh | 18 | diff --git a/regress/integrity.sh b/regress/integrity.sh |
19 | index 39d310de..fd7d58bc 100644 | 19 | index 1df2924f..ed378337 100644 |
20 | --- a/regress/integrity.sh | 20 | --- a/regress/integrity.sh |
21 | +++ b/regress/integrity.sh | 21 | +++ b/regress/integrity.sh |
22 | @@ -5,8 +5,6 @@ tid="integrity" | 22 | @@ -60,14 +60,16 @@ for m in $macs; do |
23 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak | ||
24 | |||
25 | # start at byte 2900 (i.e. after kex) and corrupt at different offsets | ||
26 | -# XXX the test hangs if we modify the low bytes of the packet length | ||
27 | -# XXX and ssh tries to read... | ||
28 | tries=10 | ||
29 | startoffset=2900 | ||
30 | macs=`${SSH} -Q mac` | ||
31 | @@ -27,6 +25,7 @@ for m in $macs; do | ||
32 | elen=0 | ||
33 | epad=0 | ||
34 | emac=0 | ||
35 | + etmo=0 | ||
36 | ecnt=0 | ||
37 | skip=0 | ||
38 | for off in `jot $tries $startoffset`; do | ||
39 | @@ -61,14 +60,16 @@ for m in $macs; do | ||
40 | Corrupted?MAC* | *message?authentication?code?incorrect*) | 23 | Corrupted?MAC* | *message?authentication?code?incorrect*) |
41 | emac=`expr $emac + 1`; skip=0;; | 24 | emac=`expr $emac + 1`; skip=0;; |
42 | padding*) epad=`expr $epad + 1`; skip=0;; | 25 | padding*) epad=`expr $epad + 1`; skip=0;; |