tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Remove the obsolete A and P flags from MALLOC_OPTIONS.

ok dtucker

Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59
This commit is contained in:
tb@openbsd.org 2016-10-31 23:45:08 +00:00 committed by Damien Miller
parent b0899ee26a
commit 36f58e6822
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regress/Makefile
View File

@ -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 $
REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
tests: prep $(REGRESS_TARGETS) tests: prep $(REGRESS_TARGETS)
@ -116,7 +116,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
SUDO_CLEAN+= /var/run/testdata_${USERNAME} /var/run/keycommand_${USERNAME} SUDO_CLEAN+= /var/run/testdata_${USERNAME} /var/run/keycommand_${USERNAME}
# Enable all malloc(3) randomisations and checks # Enable all malloc(3) randomisations and checks
TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" TEST_ENV= "MALLOC_OPTIONS=FGJRX"
TEST_SSH_SSHKEYGEN?=ssh-keygen TEST_SSH_SSHKEYGEN?=ssh-keygen

4
regress/connect-privsep.sh
View File

@ -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. # Placed in the Public Domain.
tid="proxy connect with privsep" tid="proxy connect with privsep"
@ -27,7 +27,7 @@ done
# Because sandbox is sensitive to changes in libc, especially malloc, retest # Because sandbox is sensitive to changes in libc, especially malloc, retest
# with every malloc.conf option (and none). # with every malloc.conf option (and none).
if [ -z "TEST_MALLOC_OPTIONS" ]; then if [ -z "TEST_MALLOC_OPTIONS" ]; then
mopts="A F G H J P R S X < >" mopts="F G H J R S X < >"
else else
mopts=`echo $TEST_MALLOC_OPTIONS | sed 's/./& /g'` mopts=`echo $TEST_MALLOC_OPTIONS | sed 's/./& /g'`
fi fi

4
regress/unittests/bitmap/Makefile
View File

@ -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 PROG=test_bitmap
SRCS=tests.c SRCS=tests.c

4
regress/unittests/hostkeys/Makefile
View File

@ -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 PROG=test_hostkeys
SRCS=tests.c test_iterate.c SRCS=tests.c test_iterate.c

4
regress/unittests/kex/Makefile
View File

@ -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 PROG=test_kex
SRCS=tests.c test_kex.c SRCS=tests.c test_kex.c

4
regress/unittests/match/Makefile
View File

@ -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 PROG=test_match
SRCS=tests.c SRCS=tests.c

4
regress/unittests/sshkey/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.1 2014/06/24 01:14:18 djm 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 PROG=test_sshkey
SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c

4
regress/unittests/utf8/Makefile
View File

@ -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 PROG=test_utf8
SRCS=tests.c SRCS=tests.c