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

configure.ac: remove smallstackcache from linuxkm default options; add several feature exclusions to enable-all and enable-all-crypto to make them compatible with fips=ready; render the FIPS option in the feature summary at end.

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-11-26 00:19:35 -06:00
parent 2a2ba896ec
commit cfc08cc13f
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
configure.ac
View File

@@ -416,6 +416,16 @@ then
then then
enable_compkey=no enable_compkey=no
fi fi
if test "$ENABLED_FIPS" = "yes"
then
enable_xchacha=no
enable_pkcs7=no
enable_scep=no
enable_openssh=no
enable_ed25519=no
enable_ed448=no
fi
fi fi
@@ -509,6 +519,14 @@ then
# Enable ECC Import checks # Enable ECC Import checks
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_VALIDATE_ECC_IMPORT" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_VALIDATE_ECC_IMPORT"
fi fi
if test "$ENABLED_FIPS" = "yes"
then
enable_xchacha=no
enable_pkcs7=no
enable_ed25519=no
enable_ed448=no
fi
fi fi
@@ -3696,16 +3714,10 @@ fi
# Small Stack - Cache on object # Small Stack - Cache on object
if test "$ENABLED_LINUXKM_DEFAULTS" = "yes"
then
ENABLED_SMALL_STACK_CACHE_DEFAULT=yes
else
ENABLED_SMALL_STACK_CACHE_DEFAULT=no
fi
AC_ARG_ENABLE([smallstackcache], AC_ARG_ENABLE([smallstackcache],
[AS_HELP_STRING([--enable-smallstackcache],[Enable Small Stack Usage Caching (default: disabled)])], [AS_HELP_STRING([--enable-smallstackcache],[Enable Small Stack Usage Caching (default: disabled)])],
[ ENABLED_SMALL_STACK_CACHE=$enableval ], [ ENABLED_SMALL_STACK_CACHE=$enableval ],
[ ENABLED_SMALL_STACK_CACHE=$ENABLED_SMALL_STACK_CACHE_DEFAULT ] [ ENABLED_SMALL_STACK_CACHE=no ]
) )
if test "x$ENABLED_SMALL_STACK_CACHE" = "xyes" if test "x$ENABLED_SMALL_STACK_CACHE" = "xyes"
@@ -5986,10 +5998,10 @@ AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"])
AM_CONDITIONAL([BUILD_RC2],[test "x$ENABLED_RC2" = "xyes"]) AM_CONDITIONAL([BUILD_RC2],[test "x$ENABLED_RC2" = "xyes"])
if test "$ax_enable_debug" = "yes" || if test "$ax_enable_debug" = "yes" ||
test "$ENABLED_STACKSIZE" = "yes" || test "$ENABLED_STACKSIZE" = "yes" ||
(test "$ENABLED_LEANTLS" = "no" && (test "$ENABLED_LEANTLS" = "no" &&
test "$ENABLED_LEANPSK" = "no" && test "$ENABLED_LEANPSK" = "no" &&
test "$ENABLED_LOWRESOURCE" = "no") test "$ENABLED_LOWRESOURCE" = "no")
then then
AM_CFLAGS="$AM_CFLAGS -DHAVE_WC_INTROSPECTION" AM_CFLAGS="$AM_CFLAGS -DHAVE_WC_INTROSPECTION"
fi fi
@@ -6145,6 +6157,11 @@ echo " * make -j: $enable_jobserver"
echo " * VCS checkout: $ac_cv_vcs_checkout" echo " * VCS checkout: $ac_cv_vcs_checkout"
echo echo
echo " Features " echo " Features "
if test "$ENABLED_FIPS" = "yes"; then
echo " * FIPS: $FIPS_VERSION"
else
echo " * FIPS: $ENABLED_FIPS"
fi
echo " * Single threaded: $ENABLED_SINGLETHREADED" echo " * Single threaded: $ENABLED_SINGLETHREADED"
echo " * Filesystem: $ENABLED_FILESYSTEM" echo " * Filesystem: $ENABLED_FILESYSTEM"
echo " * OpenSSH Build: $ENABLED_OPENSSH" echo " * OpenSSH Build: $ENABLED_OPENSSH"