forked from wolfSSL/wolfssl
make sure no asn doesn't build big int
This commit is contained in:
86
configure.ac
86
configure.ac
@ -209,42 +209,6 @@ fi
|
|||||||
AM_CONDITIONAL([BUILD_LEANPSK], [test "x$ENABLED_LEANPSK" = "xyes"])
|
AM_CONDITIONAL([BUILD_LEANPSK], [test "x$ENABLED_LEANPSK" = "xyes"])
|
||||||
|
|
||||||
|
|
||||||
# fastmath
|
|
||||||
AC_ARG_ENABLE([fastmath],
|
|
||||||
[ --enable-fastmath Enable fast math for BigInts (default: disabled)],
|
|
||||||
[ ENABLED_FASTMATH=$enableval ],
|
|
||||||
[ ENABLED_FASTMATH=no ]
|
|
||||||
)
|
|
||||||
|
|
||||||
if test "x$ENABLED_FASTMATH" = "xyes"
|
|
||||||
then
|
|
||||||
AM_CFLAGS="$AM_CFLAGS -DUSE_FAST_MATH"
|
|
||||||
ENABLED_SLOWMATH="no"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# fast HUGE math
|
|
||||||
AC_ARG_ENABLE([fasthugemath],
|
|
||||||
[ --enable-fasthugemath Enable fast math + huge code (default: disabled)],
|
|
||||||
[ ENABLED_FASTHUGEMATH=$enableval ],
|
|
||||||
[ ENABLED_FASTHUGEMATH=no ]
|
|
||||||
)
|
|
||||||
|
|
||||||
if test "$ENABLED_BUMP" = "yes"
|
|
||||||
then
|
|
||||||
ENABLED_FASTHUGEMATH="yes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$ENABLED_FASTHUGEMATH" = "yes"
|
|
||||||
then
|
|
||||||
ENABLED_FASTMATH="yes"
|
|
||||||
AM_CFLAGS="$AM_CFLAGS -DUSE_FAST_MATH"
|
|
||||||
ENABLED_SLOWMATH="no"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_CONDITIONAL([BUILD_FASTMATH], [test "x$ENABLED_FASTMATH" = "xyes"])
|
|
||||||
AM_CONDITIONAL([BUILD_SLOWMATH], [test "x$ENABLED_SLOWMATH" = "xyes"])
|
|
||||||
|
|
||||||
# big cache
|
# big cache
|
||||||
AC_ARG_ENABLE([bigcache],
|
AC_ARG_ENABLE([bigcache],
|
||||||
[ --enable-bigcache Enable big session cache (default: disabled)],
|
[ --enable-bigcache Enable big session cache (default: disabled)],
|
||||||
@ -606,7 +570,8 @@ AM_CONDITIONAL([BUILD_DH], [test "x$ENABLED_DH" = "xyes"])
|
|||||||
|
|
||||||
|
|
||||||
# ASN
|
# ASN
|
||||||
# can't use certs, rsa, dsa, dh, or ecc if leaving out asn
|
# turn off asn, which means no certs, no rsa, no dh, no dsa, no ecc,
|
||||||
|
# and no big int, use this to disable all public key stuff
|
||||||
AC_ARG_ENABLE([asn],
|
AC_ARG_ENABLE([asn],
|
||||||
[ --enable-asn Enable ASN (default: enabled)],
|
[ --enable-asn Enable ASN (default: enabled)],
|
||||||
[ ENABLED_ASN=$enableval ],
|
[ ENABLED_ASN=$enableval ],
|
||||||
@ -615,12 +580,12 @@ AC_ARG_ENABLE([asn],
|
|||||||
|
|
||||||
if test "$ENABLED_ASN" = "no"
|
if test "$ENABLED_ASN" = "no"
|
||||||
then
|
then
|
||||||
AM_CFLAGS="$AM_CFLAGS -DNO_ASN -DNO_CERTS"
|
AM_CFLAGS="$AM_CFLAGS -DNO_ASN -DNO_CERTS -DNO_BIG_INT"
|
||||||
else
|
else
|
||||||
# turn off ASN if leanpsk on
|
# turn off ASN if leanpsk on
|
||||||
if test "$ENABLED_LEANPSK" = "yes"
|
if test "$ENABLED_LEANPSK" = "yes"
|
||||||
then
|
then
|
||||||
AM_CFLAGS="$AM_CFLAGS -DNO_ASN -DNO_CERTS"
|
AM_CFLAGS="$AM_CFLAGS -DNO_ASN -DNO_CERTS -DNO_BIG_INT"
|
||||||
ENABLED_ASN=no
|
ENABLED_ASN=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -650,6 +615,12 @@ then
|
|||||||
AC_MSG_ERROR([please enable psk if disabling asn.])
|
AC_MSG_ERROR([please enable psk if disabling asn.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$ENABLED_ASN" = "no"
|
||||||
|
then
|
||||||
|
ENABLED_FASTMATH=no
|
||||||
|
ENABLED_SLOWMATH=no
|
||||||
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL([BUILD_ASN], [test "x$ENABLED_ASN" = "xyes"])
|
AM_CONDITIONAL([BUILD_ASN], [test "x$ENABLED_ASN" = "xyes"])
|
||||||
|
|
||||||
|
|
||||||
@ -1005,6 +976,43 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# fastmath
|
||||||
|
AC_ARG_ENABLE([fastmath],
|
||||||
|
[ --enable-fastmath Enable fast math for BigInts (default: disabled)],
|
||||||
|
[ ENABLED_FASTMATH=$enableval ],
|
||||||
|
[ ENABLED_FASTMATH=no ]
|
||||||
|
)
|
||||||
|
|
||||||
|
if test "x$ENABLED_FASTMATH" = "xyes"
|
||||||
|
then
|
||||||
|
AM_CFLAGS="$AM_CFLAGS -DUSE_FAST_MATH"
|
||||||
|
ENABLED_SLOWMATH="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# fast HUGE math
|
||||||
|
AC_ARG_ENABLE([fasthugemath],
|
||||||
|
[ --enable-fasthugemath Enable fast math + huge code (default: disabled)],
|
||||||
|
[ ENABLED_FASTHUGEMATH=$enableval ],
|
||||||
|
[ ENABLED_FASTHUGEMATH=no ]
|
||||||
|
)
|
||||||
|
|
||||||
|
if test "$ENABLED_BUMP" = "yes"
|
||||||
|
then
|
||||||
|
ENABLED_FASTHUGEMATH="yes"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$ENABLED_FASTHUGEMATH" = "yes"
|
||||||
|
then
|
||||||
|
ENABLED_FASTMATH="yes"
|
||||||
|
AM_CFLAGS="$AM_CFLAGS -DUSE_FAST_MATH"
|
||||||
|
ENABLED_SLOWMATH="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL([BUILD_FASTMATH], [test "x$ENABLED_FASTMATH" = "xyes"])
|
||||||
|
AM_CONDITIONAL([BUILD_SLOWMATH], [test "x$ENABLED_SLOWMATH" = "xyes"])
|
||||||
|
|
||||||
|
|
||||||
# Enable Examples, used to disable examples
|
# Enable Examples, used to disable examples
|
||||||
AC_ARG_ENABLE([examples],
|
AC_ARG_ENABLE([examples],
|
||||||
[ --enable-examples Enable Examples (default: enabled)],
|
[ --enable-examples Enable Examples (default: enabled)],
|
||||||
|
@ -166,7 +166,7 @@ void ctaocrypt_test(void* args)
|
|||||||
|
|
||||||
((func_args*)args)->return_code = -1; /* error state */
|
((func_args*)args)->return_code = -1; /* error state */
|
||||||
|
|
||||||
#if !defined(CYASSL_LEANPSK)
|
#if !defined(NO_BIG_INT)
|
||||||
if (CheckCtcSettings() != 1)
|
if (CheckCtcSettings() != 1)
|
||||||
err_sys("Build vs runtime math mismatch\n", -1234);
|
err_sys("Build vs runtime math mismatch\n", -1234);
|
||||||
|
|
||||||
@ -174,7 +174,7 @@ void ctaocrypt_test(void* args)
|
|||||||
if (CheckFastMathSettings() != 1)
|
if (CheckFastMathSettings() != 1)
|
||||||
err_sys("Build vs runtime fastmath FP_MAX_BITS mismatch\n", -1235);
|
err_sys("Build vs runtime fastmath FP_MAX_BITS mismatch\n", -1235);
|
||||||
#endif /* USE_FAST_MATH */
|
#endif /* USE_FAST_MATH */
|
||||||
#endif /* !CYASSL_LEANPSK */
|
#endif /* !NO_BIG_INT */
|
||||||
|
|
||||||
|
|
||||||
#ifndef NO_MD5
|
#ifndef NO_MD5
|
||||||
|
Reference in New Issue
Block a user