wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: support --enable-dh=const, and link with libm ("LT_LIB_M") only if ENABLED_DH = yes.

Browse Source
This commit is contained in:
Daniel Pouzzner
2022-06-23 15:00:59 -05:00
parent e2ad62b3d1
commit 768737d21e
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
configure.ac
View File

@@ -128,7 +128,6 @@ AC_TYPE_SIZE_T
AC_TYPE_UINT8_T AC_TYPE_UINT8_T
AC_TYPE_UINTPTR_T AC_TYPE_UINTPTR_T
AM_PROG_AS AM_PROG_AS
LT_LIB_M
OPTIMIZE_CFLAGS="-Os" OPTIMIZE_CFLAGS="-Os"
OPTIMIZE_FAST_CFLAGS="-O2" OPTIMIZE_FAST_CFLAGS="-O2"
@@ -827,6 +826,15 @@ then
# Enable multiple attribute additions such as DC # Enable multiple attribute additions such as DC
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_MULTI_ATTRIB" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_MULTI_ATTRIB"
# Enable DH Extra
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_EXTRA"
# Enable deterministic ECC signing API with variant
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ECDSA_DETERMINISTIC_K_VARIANT"
# Store issuer name components when parsing certificates.
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_ISSUER_NAMES"
fi fi
@@ -3373,7 +3381,7 @@ AC_ARG_ENABLE([dh],
[ ENABLED_DH=yes ] [ ENABLED_DH=yes ]
) )
if test "$ENABLED_OPENSSH" = "yes" if test "$ENABLED_OPENSSH" = "yes" && test "$ENABLED_DH" = "no"
then then
ENABLED_DH="yes" ENABLED_DH="yes"
fi fi
@@ -3390,7 +3398,12 @@ else
fi fi
fi fi
if test "x$ENABLED_SNIFFER" = "xyes" && test "x$ENABLED_DH" = "xyes" if test "$ENABLED_DH" = "const"
then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_CONST"
fi
if test "$ENABLED_SNIFFER" = "yes" && test "$ENABLED_DH" != "no"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_EXTRA" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DH_EXTRA"
fi fi
@@ -3410,7 +3423,7 @@ then
fi fi
if test "x$ENABLED_ANON" = "xyes" if test "x$ENABLED_ANON" = "xyes"
then then
if test "x$ENABLED_DH" != "xyes" if test "$ENABLED_DH" = "no"
then then
AC_MSG_ERROR([Anonymous suite requires DH.]) AC_MSG_ERROR([Anonymous suite requires DH.])
fi fi
@@ -4494,7 +4507,7 @@ then
fi fi
# Diffie-Hellman # Diffie-Hellman
if test "$ENABLED_DH" = "yes" if test "$ENABLED_DH" != "no"
then then
if test "$ENABLED_TLS13" = "yes" || test "$ENABLED_SUPPORTED_CURVES" = "yes" if test "$ENABLED_TLS13" = "yes" || test "$ENABLED_SUPPORTED_CURVES" = "yes"
then then
@@ -4533,7 +4546,7 @@ then
ENABLED_TLS13=no ENABLED_TLS13=no
fi fi
if test "$ENABLED_TLS13" = "yes" && (test "x$ENABLED_ECC" = "xyes" || \ if test "$ENABLED_TLS13" = "yes" && (test "x$ENABLED_ECC" = "xyes" || \
test "x$ENABLED_DH" = "xyes") test "$ENABLED_DH" != "no")
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_SUPPORTED_CURVES" AM_CFLAGS="$AM_CFLAGS -DHAVE_SUPPORTED_CURVES"
fi fi
@@ -6284,7 +6297,7 @@ if test "$ENABLED_RSA" = "yes" && test "$ENABLED_SP_RSA" = "yes"; then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_RSA" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_RSA"
AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_RSA" AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_RSA"
fi fi
if test "$ENABLED_DH" = "yes" && test "$ENABLED_SP_DH" = "yes"; then if test "$ENABLED_DH" != "no" && test "$ENABLED_SP_DH" = "yes"; then
ENABLED_SP=yes ENABLED_SP=yes
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_DH" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_SP_DH"
AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_DH" AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_HAVE_SP_DH"
@@ -6369,7 +6382,7 @@ if test "$ENABLED_SP_MATH" = "yes"; then
if test "$ENABLED_SP_RSA" = "no" && test "$ENABLED_RSA" = "yes"; then if test "$ENABLED_SP_RSA" = "no" && test "$ENABLED_RSA" = "yes"; then
AC_MSG_ERROR([Cannot use RSA single precision only math and RSA]) AC_MSG_ERROR([Cannot use RSA single precision only math and RSA])
fi fi
if test "$ENABLED_SP_DH" = "no" && test "$ENABLED_DH" = "yes"; then if test "$ENABLED_SP_DH" = "no" && test "$ENABLED_DH" != "no"; then
AC_MSG_ERROR([Cannot use DH single precision only math and DH]) AC_MSG_ERROR([Cannot use DH single precision only math and DH])
fi fi
@@ -7574,6 +7587,12 @@ then
fi fi
# Link with the math library iff needed.
if test "$ENABLED_DH" != "no" && test "$ENABLED_DH" != "const"; then
LT_LIB_M
fi
################################################################################ ################################################################################
# USER SETTINGS # USER SETTINGS
@@ -7776,7 +7795,7 @@ AM_CONDITIONAL([BUILD_ECCSI],[test "x$ENABLED_ECCSI" = "xyes" || test "x$ENABLED
AM_CONDITIONAL([BUILD_SAKKE],[test "x$ENABLED_SAKKE" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_SAKKE],[test "x$ENABLED_SAKKE" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_MEMORY],[test "x$ENABLED_MEMORY" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_MEMORY],[test "x$ENABLED_MEMORY" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_RSA],[test "x$ENABLED_RSA" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_RSA],[test "x$ENABLED_RSA" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_DH],[test "x$ENABLED_DH" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_DH],[test "x$ENABLED_DH" != "xno" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_ASN],[test "x$ENABLED_ASN" != "xno" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_ASN],[test "x$ENABLED_ASN" != "xno" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_AES],[test "x$ENABLED_AES" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_AES],[test "x$ENABLED_AES" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_CODING],[test "x$ENABLED_CODING" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_CODING],[test "x$ENABLED_CODING" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])