Skip to content

Configure.ac updates #10712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kareem-wolfssl wants to merge 3 commits into
base: master
Choose a base branch
from
+32 −0
Open

Configure.ac updates #10712

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fb3fdc
Prevent command injection in includedir/libdir in configure.ac.
kareem-wolfssl Jun 16, 2026
6f4b1fb
Enable curve25519 support in lighttpd builds by default to enable PQC…
kareem-wolfssl Jun 16, 2026
1ca5e24
Error or warn users trying to build SP math assembly for MinGW as thi…
kareem-wolfssl Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5118,6 +5118,11 @@ then
ENABLED_CURVE25519="yes"
fi

if test "$ENABLED_CURVE25519" = "no" && test "$ENABLED_LIGHTY" = "yes" && test "x$ENABLED_FIPS" = "xno"
then
ENABLED_CURVE25519="yes"
fi


# ED25519
AC_ARG_ENABLE([ed25519],
Expand Down Expand Up @@ -10480,6 +10485,23 @@ if test "$ENABLED_SP_MATH_ALL" = "yes" && test "$ENABLED_ASM" != "no"; then
fi


if test "$ENABLED_SP_ASM" = "yes" && test "$ENABLED_SP" = "yes"; then
case $host_cpu in
*x86_64* | *amd64*)
case $host_os in
*mingw* | *cygwin* | *msys*)
if test "$enable_sp_asm" = "yes"; then
AC_MSG_ERROR([--enable-sp-asm is not supported for x86_64 Windows hosts (MinGW/Cygwin). Reconfigure without --enable-sp-asm to use the C SP implementation.])
else
AC_MSG_WARN([x86_64 SP assembly is not supported for Windows hosts (MinGW/Cygwin); disabling SP assembly and using the C implementation.])
ENABLED_SP_ASM=no
fi
;;
esac
;;
esac
fi

if test "$ENABLED_SP_ASM" = "yes" && test "$ENABLED_SP" = "yes"; then
if test "$ENABLED_SP_NONBLOCK" = "yes"; then
AC_MSG_ERROR([SP non-blocking not supported with sp-asm])
Expand Down Expand Up @@ -12489,6 +12511,16 @@ if test "x$WOLFSSL_EXEC_PREFIX_ABS" = "xNONE"; then
fi
prefix=$WOLFSSL_PREFIX_ABS
exec_prefix=$WOLFSSL_EXEC_PREFIX_ABS
# The eval calls below expand ${prefix}/${exec_prefix} references embedded in
# the libdir/includedir values. eval would, however, also execute any shell
# command substitution contained in a --libdir/--includedir value (e.g.
# --libdir='$(cmd)/lib'), running arbitrary commands during configure.
# Reject values that contain command substitution before the eval.
case "$libdir $includedir" in
*'`'* | *'$('*)
AC_MSG_ERROR([--libdir and --includedir must not contain shell command substitution])
;;
esac
Comment on lines +12514 to +12523
eval WOLFSSL_LIBDIR_ABS=\"$libdir\"
eval WOLFSSL_INCLUDEDIR_ABS=\"$includedir\"
AC_SUBST([WOLFSSL_PREFIX_ABS])
Expand Down
Loading