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

do not default to heapmath if no other math libraries found, add NO_BIG_INT as a math option in settings.h

Browse Source
This commit is contained in:
JacobBarthelmeh
2023-04-13 14:38:35 -07:00
parent 26a0142f51
commit 04ee247389
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@ -537,24 +537,6 @@ fi
# MATH LIBRARY SELECTION # MATH LIBRARY SELECTION
# no math library
AC_ARG_ENABLE([nomath],
[AS_HELP_STRING([--enable-nomath],[Enable no math library (default: disabled)])],
[ ENABLED_NOMATH=$enableval ],
[ ENABLED_NOMATH="no" ]
)
if test "$ENABLED_NOMATH" = "yes"
then
DEF_SP_MATH="no"
DEF_FAST_MATH="no"
ENABLED_SP_MATH_DEFAULT=no
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NO_MATH"
ENABLED_HEAPMATH="no"
ENABLED_SP="no"
ENABLED_SP_MATH_ALL="no"
fi
# Single Precision maths implementation # Single Precision maths implementation
AC_ARG_ENABLE([sp], AC_ARG_ENABLE([sp],
[AS_HELP_STRING([--enable-sp],[Enable Single Precision maths implementation (default: disabled)])], [AS_HELP_STRING([--enable-sp],[Enable Single Precision maths implementation (default: disabled)])],
@ -690,7 +672,7 @@ AC_ARG_ENABLE([heapmath],
[ ENABLED_HEAPMATH=$enableval ], [ ENABLED_HEAPMATH=$enableval ],
[ ENABLED_HEAPMATH=no] [ ENABLED_HEAPMATH=no]
) )
if test "x$ENABLED_HEAPMATH" = "xyes" || (test "x$ENABLED_NOMATH" = "xno" && test "x$ENABLED_SP_MATH_ALL" = "xno" && test "x$ENABLED_FASTMATH" = "xno" && test "x$ENABLED_SP_MATH" = "xno") if test "x$ENABLED_HEAPMATH" = "xyes"
then then
AM_CFLAGS="$AM_CFLAGS -DUSE_INTEGER_HEAP_MATH" AM_CFLAGS="$AM_CFLAGS -DUSE_INTEGER_HEAP_MATH"
ENABLED_HEAPMATH="yes" ENABLED_HEAPMATH="yes"
@ -7946,6 +7928,10 @@ AS_IF([test "x$ENABLED_16BIT" = "xyes" && \
################################################################################ ################################################################################
# Update CFLAGS based on options # # Update CFLAGS based on options #
################################################################################ ################################################################################
AS_IF([test "x$ENABLED_SP_MATH_ALL" = "xno" && test "x$ENABLED_FASTMATH" = "xno" &&
test "x$ENABLED_HEAPMATH" = "xno"],
[AM_CFLAGS="$AM_CFLAGS -DNO_BIG_INT"])
AS_IF([test "x$ENABLED_CERTS" = "xno"], AS_IF([test "x$ENABLED_CERTS" = "xno"],
[AM_CFLAGS="$AM_CFLAGS -DNO_CERTS"]) [AM_CFLAGS="$AM_CFLAGS -DNO_CERTS"])

6
wolfssl/wolfcrypt/settings.h
View File

@ -2036,10 +2036,8 @@ extern void uITRON4_free(void *p) ;
* Constant time: Not supported * Constant time: Not supported
* Enable: USE_INTEGER_HEAP_MATH * Enable: USE_INTEGER_HEAP_MATH
*/ */
#elif defined(WOLFSSL_NO_MATH) #elif defined(NO_BIG_INT)
/* 5) No math library compiled in /* 5) No big integer math libraries
* Does not support any public key operations or algorithms that
* require the math library.
*/ */
#else #else
/* default is SP Math. */ /* default is SP Math. */