summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/usr.bin/ssh/Makefile4
-rw-r--r--regress/usr.bin/ssh/connect-privsep.sh4
-rw-r--r--regress/usr.bin/ssh/unittests/bitmap/Makefile4
-rw-r--r--regress/usr.bin/ssh/unittests/hostkeys/Makefile4
-rw-r--r--regress/usr.bin/ssh/unittests/kex/Makefile4
-rw-r--r--regress/usr.bin/ssh/unittests/match/Makefile4
-rw-r--r--regress/usr.bin/ssh/unittests/sshbuf/Makefile4
-rw-r--r--regress/usr.bin/ssh/unittests/sshkey/Makefile4
-rw-r--r--regress/usr.bin/ssh/unittests/utf8/Makefile4
9 files changed, 18 insertions, 18 deletions
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile
index 3eab4d2fce3..f52f6798556 100644
--- a/regress/usr.bin/ssh/Makefile
+++ b/regress/usr.bin/ssh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2016/10/06 09:31:38 natano Exp $
+# $OpenBSD: Makefile,v 1.92 2016/10/31 23:45:08 tb Exp $
.ifndef SKIP_UNIT
SUBDIR= unittests
@@ -105,7 +105,7 @@ CLEANFILES+= *.core actual agent-key.* authorized_keys_${USERNAME} \
SUDO_CLEAN+= /var/run/testdata_${USERNAME} /var/run/keycommand_${USERNAME}
# Enable all malloc(3) randomisations and checks
-TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+TEST_ENV= "MALLOC_OPTIONS=FGJRX"
t1:
ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
diff --git a/regress/usr.bin/ssh/connect-privsep.sh b/regress/usr.bin/ssh/connect-privsep.sh
index b7bf906e62c..782c0375626 100644
--- a/regress/usr.bin/ssh/connect-privsep.sh
+++ b/regress/usr.bin/ssh/connect-privsep.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: connect-privsep.sh,v 1.6 2015/03/03 22:35:19 markus Exp $
+# $OpenBSD: connect-privsep.sh,v 1.7 2016/10/31 23:45:08 tb Exp $
# Placed in the Public Domain.
tid="proxy connect with privsep"
@@ -25,7 +25,7 @@ done
# Because sandbox is sensitive to changes in libc, especially malloc, retest
# with every malloc.conf option (and none).
-for m in '' A F G H J P R S X '<' '>'; do
+for m in '' F G H J R S X '<' '>'; do
for p in ${SSH_PROTOCOLS}; do
env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
if [ $? -ne 0 ]; then
diff --git a/regress/usr.bin/ssh/unittests/bitmap/Makefile b/regress/usr.bin/ssh/unittests/bitmap/Makefile
index b704d22d6d7..b3b7d12c705 100644
--- a/regress/usr.bin/ssh/unittests/bitmap/Makefile
+++ b/regress/usr.bin/ssh/unittests/bitmap/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2015/01/15 07:36:28 djm Exp $
+# $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $
-TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+TEST_ENV= "MALLOC_OPTIONS=FGJRX"
PROG=test_bitmap
SRCS=tests.c
diff --git a/regress/usr.bin/ssh/unittests/hostkeys/Makefile b/regress/usr.bin/ssh/unittests/hostkeys/Makefile
index f52a85fb150..43968c70103 100644
--- a/regress/usr.bin/ssh/unittests/hostkeys/Makefile
+++ b/regress/usr.bin/ssh/unittests/hostkeys/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2015/02/16 22:18:34 djm Exp $
+# $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $
-TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+TEST_ENV= "MALLOC_OPTIONS=FGJRX"
PROG=test_hostkeys
SRCS=tests.c test_iterate.c
diff --git a/regress/usr.bin/ssh/unittests/kex/Makefile b/regress/usr.bin/ssh/unittests/kex/Makefile
index 6532cb00a6a..e268daad2be 100644
--- a/regress/usr.bin/ssh/unittests/kex/Makefile
+++ b/regress/usr.bin/ssh/unittests/kex/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2015/01/24 10:39:21 miod Exp $
+# $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $
-TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+TEST_ENV= "MALLOC_OPTIONS=FGJRX"
PROG=test_kex
SRCS=tests.c test_kex.c
diff --git a/regress/usr.bin/ssh/unittests/match/Makefile b/regress/usr.bin/ssh/unittests/match/Makefile
index dc802f58d15..3197ece990c 100644
--- a/regress/usr.bin/ssh/unittests/match/Makefile
+++ b/regress/usr.bin/ssh/unittests/match/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1 2016/08/19 06:44:13 djm Exp $
+# $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:09 tb Exp $
-TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+TEST_ENV= "MALLOC_OPTIONS=FGJRX"
PROG=test_match
SRCS=tests.c
diff --git a/regress/usr.bin/ssh/unittests/sshbuf/Makefile b/regress/usr.bin/ssh/unittests/sshbuf/Makefile
index 2cdb7618e7e..2926c32a3e7 100644
--- a/regress/usr.bin/ssh/unittests/sshbuf/Makefile
+++ b/regress/usr.bin/ssh/unittests/sshbuf/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 2014/07/16 20:04:21 okan Exp $
+# $OpenBSD: Makefile,v 1.4 2016/10/31 23:45:09 tb Exp $
-TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+TEST_ENV= "MALLOC_OPTIONS=FGJRX"
PROG=test_sshbuf
SRCS=tests.c
diff --git a/regress/usr.bin/ssh/unittests/sshkey/Makefile b/regress/usr.bin/ssh/unittests/sshkey/Makefile
index 75f98ee6fb1..8411aec5124 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/Makefile
+++ b/regress/usr.bin/ssh/unittests/sshkey/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2014/07/16 20:04:21 okan Exp $
+# $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $
-TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+TEST_ENV= "MALLOC_OPTIONS=FGJRX"
PROG=test_sshkey
SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c
diff --git a/regress/usr.bin/ssh/unittests/utf8/Makefile b/regress/usr.bin/ssh/unittests/utf8/Makefile
index 150ea2f2e2c..85cf7b81fc0 100644
--- a/regress/usr.bin/ssh/unittests/utf8/Makefile
+++ b/regress/usr.bin/ssh/unittests/utf8/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2016/05/30 12:14:08 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $
-TEST_ENV= "MALLOC_OPTIONS=CFGJPRSUX"
+TEST_ENV= "MALLOC_OPTIONS=CFGJRSUX"
PROG=test_utf8
SRCS=tests.c