From 1e657d592d1afa169ffb0a7a1a407b4fe5c97686 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 26 Feb 2013 18:58:06 +1100
Subject: [PATCH]    - djm@cvs.openbsd.org 2013/02/20 08:27:50     
 [integrity.sh]      Add an option to modpipe that warns if the modification
 offset it not      reached in it's stream and turn it on for t-integrity.
 This should catch      cases where the session is not fuzzed for being too
 short (cf. my last      "oops" commit)

---
 ChangeLog            | 9 +++++++++
 regress/integrity.sh | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0d0340f8f..076aca702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+20130226
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2013/02/20 08:27:50
+     [integrity.sh]
+     Add an option to modpipe that warns if the modification offset it not
+     reached in it's stream and turn it on for t-integrity. This should catch
+     cases where the session is not fuzzed for being too short (cf. my last
+     "oops" commit)
+
 20130225
  - (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed
    to use Solaris native GSS libs.  Patch from Pierre Ossman.
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 2a93372fc..a57ec87f9 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: integrity.sh,v 1.6 2013/02/19 02:14:09 djm Exp $
+#	$OpenBSD: integrity.sh,v 1.7 2013/02/20 08:27:50 djm Exp $
 #	Placed in the Public Domain.
 
 tid="integrity"
@@ -42,7 +42,7 @@ for m in $macs; do
 			continue
 		fi
 		# modify output from sshd at offset $off
-		pxy="proxycommand=$cmd | $OBJ/modpipe -m xor:$off:1"
+		pxy="proxycommand=$cmd | $OBJ/modpipe -wm xor:$off:1"
 		case $m in
 			aes*gcm*)	macopt="-c $m";;
 			*)		macopt="-m $m";;