3 files changed, 34 insertions, 4 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 18f9f124c..c3aec43fc 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -90,6 +90,8 @@ TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
 
 TEST_SSH_SSHKEYGEN?=ssh-keygen
 
+CPPFLAGS=-I..
+
 t1:
         ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
         tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 261e9f9a9..0a0146e05 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: integrity.sh,v 1.5 2013/02/18 22:26:47 djm Exp $
+#       $OpenBSD: integrity.sh,v 1.6 2013/02/19 02:14:09 djm Exp $
 #       Placed in the Public Domain.
 
 tid="integrity"
@@ -46,7 +46,7 @@ for m in $macs; do
                         *)              macopt="-m $m";;
                 esac
                 output=$(${SSH} $macopt -2F $OBJ/ssh_proxy -o "$pxy" \
-                    999.999.999.999 'printf "%2048s" " "' 2>&1)
+                    999.999.999.999 'printf "%4096s" " "' 2>&1)
                 if [ $? -eq 0 ]; then
                         fail "ssh -m $m succeeds with bit-flip at $off"
                 fi
diff --git a/regress/modpipe.c b/regress/modpipe.c
index 439be4c9d..b05915b63 100755
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -14,16 +14,44 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: modpipe.c,v 1.1 2012/12/11 23:54:40 djm Exp $ */
+/* $Id: modpipe.c,v 1.2 2013/02/19 02:15:08 djm Exp $ */
 
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
 #include <stdlib.h>
-#include <err.h>
 #include <errno.h>
 
+static void err(int, const char *, ...) __attribute__((format(printf, 2, 3)));
+static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3)));
+
+static void
+err(int r, const char *fmt, ...)
+{
+        va_list args;
+
+        va_start(args, fmt);
+        fprintf(stderr, "%s: ", strerror(errno));
+        vfprintf(stderr, fmt, args);
+        fputc('\n', stderr);
+        va_end(args);
+        exit(r);
+}
+
+static void
+errx(int r, const char *fmt, ...)
+{
+        va_list args;
+
+        va_start(args, fmt);
+        vfprintf(stderr, fmt, args);
+        fputc('\n', stderr);
+        va_end(args);
+        exit(r);
+}
+
 static void
 usage(void)
 {