summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--regress/integrity.sh4
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 @@
120130226
2 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2013/02/20 08:27:50
4 [integrity.sh]
5 Add an option to modpipe that warns if the modification offset it not
6 reached in it's stream and turn it on for t-integrity. This should catch
7 cases where the session is not fuzzed for being too short (cf. my last
8 "oops" commit)
9
120130225 1020130225
2 - (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed 11 - (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed
3 to use Solaris native GSS libs. Patch from Pierre Ossman. 12 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 @@
1# $OpenBSD: integrity.sh,v 1.6 2013/02/19 02:14:09 djm Exp $ 1# $OpenBSD: integrity.sh,v 1.7 2013/02/20 08:27:50 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="integrity" 4tid="integrity"
@@ -42,7 +42,7 @@ for m in $macs; do
42 continue 42 continue
43 fi 43 fi
44 # modify output from sshd at offset $off 44 # modify output from sshd at offset $off
45 pxy="proxycommand=$cmd | $OBJ/modpipe -m xor:$off:1" 45 pxy="proxycommand=$cmd | $OBJ/modpipe -wm xor:$off:1"
46 case $m in 46 case $m in
47 aes*gcm*) macopt="-c $m";; 47 aes*gcm*) macopt="-c $m";;
48 *) macopt="-m $m";; 48 *) macopt="-m $m";;