diff options
| -rw-r--r-- | macros/neon.m4 | 4 | ||||
| -rw-r--r-- | test/run.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/macros/neon.m4 b/macros/neon.m4 index 01072b9..8eae709 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -842,9 +842,9 @@ yes|openssl) [AC_MSG_NOTICE(using SSL library configuration from pkg-config) CPPFLAGS="$CPPFLAGS ${NE_SSL_CFLAGS}" NEON_LIBS="$NEON_LIBS ${NE_SSL_LIBS}"], - [# libcrypto may require -ldl if using the OpenSSL ENGINE branch + [# Either OpenSSL library may require -ldl if built with dynamic engine support NE_SEARCH_LIBS(RSA_new, crypto, -ldl) - NE_SEARCH_LIBS(SSL_library_init, ssl)]) + NE_SEARCH_LIBS(SSL_library_init, ssl, -ldl)]) AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) diff --git a/test/run.sh b/test/run.sh index f05c321..bfee42a 100644 --- a/test/run.sh +++ b/test/run.sh @@ -5,10 +5,10 @@ rm -f debug.log child.log ulimit -c unlimited ulimit -v 10240 -# enable an safety-checking malloc in glibc which will abort() if -# heap corruption is detected. +# Enable glibc heap consistency checks, and memory randomization. MALLOC_CHECK_=2 -export MALLOC_CHECK_ +MALLOC_PERTURB_=`expr $RANDOM % 255 2>/dev/null` +export MALLOC_CHECK_ MALLOC_PERTURB_ for f in $*; do if ${HARNESS} ./$f ${SRCDIR}; then |