summaryrefslogtreecommitdiff
path: root/debian/patches/regress-integrity-robust.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-05 23:58:12 +0100
commit0556ea972b15607b7e13ff31bc05840881c91dd3 (patch)
treed6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /debian/patches/regress-integrity-robust.patch
parentdb2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff)
parent801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff)
New upstream release (7.6p1)
Diffstat (limited to 'debian/patches/regress-integrity-robust.patch')
-rw-r--r--debian/patches/regress-integrity-robust.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/debian/patches/regress-integrity-robust.patch b/debian/patches/regress-integrity-robust.patch
deleted file mode 100644
index fe8a321c3..000000000
--- a/debian/patches/regress-integrity-robust.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 11f55875afff41aa1f1732ff138c9f76dc2a0afa Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 1 Jan 2017 15:21:10 +0000
4Subject: Make integrity tests more robust against timeouts
5
6If the first test in a series for a given MAC happens to modify the low
7bytes of a packet length, then ssh will time out and this will be
8interpreted as a test failure. Handle this failure mode.
9
10Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2658
11Patch-Name: regress-integrity-robust.patch
12
13Last-Update: 2017-01-01
14---
15 regress/integrity.sh | 6 ++++--
16 1 file changed, 4 insertions(+), 2 deletions(-)
17
18diff --git a/regress/integrity.sh b/regress/integrity.sh
19index 1df2924f..ed378337 100644
20--- a/regress/integrity.sh
21+++ b/regress/integrity.sh
22@@ -60,14 +60,16 @@ for m in $macs; do
23 Corrupted?MAC* | *message?authentication?code?incorrect*)
24 emac=`expr $emac + 1`; skip=0;;
25 padding*) epad=`expr $epad + 1`; skip=0;;
26+ *Timeout,?server*)
27+ etmo=`expr $etmo + 1`; skip=0;;
28 *) fail "unexpected error mac $m at $off: $out";;
29 esac
30 done
31- verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen"
32+ verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen timeout $etmo"
33 if [ $emac -eq 0 ]; then
34 fail "$m: no mac errors"
35 fi
36- expect=`expr $ecnt - $epad - $elen`
37+ expect=`expr $ecnt - $epad - $elen - $etmo`
38 if [ $emac -ne $expect ]; then
39 fail "$m: expected $expect mac errors, got $emac"
40 fi