feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

restore --enable-lighty with --enable-all

Browse Source 
protect lighttpd recommendations (and recommended restrictions)
to when building wolfSSL specifically for use by lighttpd, and
omit these optional settings when building `--enable-all`
This commit is contained in:
Glenn Strauss
2020-07-31 15:20:22 -04:00
committed by Daniel Pouzzner
parent a9a495270c
commit 7cee131e37
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -334,6 +334,7 @@ then
enable_srp=yes enable_srp=yes
enable_certservice=yes enable_certservice=yes
enable_jni=yes enable_jni=yes
enable_lighty=yes
enable_haproxy=yes enable_haproxy=yes
enable_stunnel=yes enable_stunnel=yes
enable_nginx=yes enable_nginx=yes
@ -3914,15 +3915,17 @@ then
AM_CFLAGS="$AM_CFLAGS -DHAVE_LIGHTY -DHAVE_WOLFSSL_SSL_H=1" AM_CFLAGS="$AM_CFLAGS -DHAVE_LIGHTY -DHAVE_WOLFSSL_SSL_H=1"
AM_CFLAGS="$AM_CFLAGS -DHAVE_EX_DATA" AM_CFLAGS="$AM_CFLAGS -DHAVE_EX_DATA"
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_ALL" AM_CFLAGS="$AM_CFLAGS -DOPENSSL_ALL"
# recommended # recommended if building wolfSSL specifically for use by lighttpd
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_COMP"
AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS"
if test "x$ENABLED_ALL" = "xno"; then if test "x$ENABLED_ALL" = "xno"; then
AM_CFLAGS="$AM_CFLAGS -DSINGLE_THREADED" AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_COMP"
ENABLED_SINGLETHREADED="yes" AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS"
ENABLED_OLD_TLS=no
if test "x$ENABLED_CRL_MONITOR" = "xno"; then
AM_CFLAGS="$AM_CFLAGS -DSINGLE_THREADED"
ENABLED_SINGLETHREADED="yes"
fi
# w/lighttpd 1.4.56 once wolfSSL is updated to expose non-filesystem funcs # w/ lighttpd 1.4.56 once wolfSSL updated to expose non-filesystem funcs
#AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM" #AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM"
#ENABLED_FILESYSTEM=no #ENABLED_FILESYSTEM=no
fi fi