From b2520f120f9d59420590a8099762425e04a428f5 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Tue, 10 Mar 2026 10:48:43 -0600 Subject: [PATCH 1/2] Ensure user-space wolfentropy builds of the v6 module compile the correct resource --- configure.ac | 1 + src/include.am | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 9f6f6b8a472..b869abb9d39 100644 --- a/configure.ac +++ b/configure.ac @@ -11334,6 +11334,7 @@ AM_CONDITIONAL([BUILD_PKCS7],[test "x$ENABLED_PKCS7" = "xyes" || test "x$ENABLED AM_CONDITIONAL([BUILD_SMIME],[test "x$ENABLED_SMIME" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_HASHFLAGS],[test "x$ENABLED_HASHFLAGS" = "xyes"]) AM_CONDITIONAL([BUILD_LINUXKM],[test "$ENABLED_LINUXKM" = "yes"]) +AM_CONDITIONAL([BUILD_KERNEL_MODE_DEFAULTS],[test "$ENABLED_KERNEL_MODE_DEFAULTS" = "yes"]) AM_CONDITIONAL([BUILD_BSDKM],[test "$ENABLED_BSDKM" = "yes"]) AM_CONDITIONAL([BUILD_KERNEL_MODULE],[test "$ENABLED_BSDKM" = "yes" || test "$ENABLED_LINUXKM" = "yes"]) AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"]) diff --git a/src/include.am b/src/include.am index 943522b4e8e..caad1625f6c 100644 --- a/src/include.am +++ b/src/include.am @@ -440,9 +440,19 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += \ wolfcrypt/src/hmac.c \ wolfcrypt/src/random.c +if BUILD_FIPS_V6 if BUILD_MEMUSE +if BUILD_KERNEL_MODE_DEFAULTS src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wolfentropy.c endif +endif +endif + +if !BUILD_FIPS_V6 +if BUILD_MEMUSE +src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wolfentropy.c +endif +endif if BUILD_RNG_BANK src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/rng_bank.c From 4d1b603587659e0b07de7170c4f021a96a4d3ab5 Mon Sep 17 00:00:00 2001 From: Kaleb Himes Date: Tue, 10 Mar 2026 14:15:42 -0600 Subject: [PATCH 2/2] Implement peer review feedback. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b869abb9d39..241a66f69db 100644 --- a/configure.ac +++ b/configure.ac @@ -11334,7 +11334,7 @@ AM_CONDITIONAL([BUILD_PKCS7],[test "x$ENABLED_PKCS7" = "xyes" || test "x$ENABLED AM_CONDITIONAL([BUILD_SMIME],[test "x$ENABLED_SMIME" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_HASHFLAGS],[test "x$ENABLED_HASHFLAGS" = "xyes"]) AM_CONDITIONAL([BUILD_LINUXKM],[test "$ENABLED_LINUXKM" = "yes"]) -AM_CONDITIONAL([BUILD_KERNEL_MODE_DEFAULTS],[test "$ENABLED_KERNEL_MODE_DEFAULTS" = "yes"]) +AM_CONDITIONAL([BUILD_KERNEL_MODE_DEFAULTS],[test "$KERNEL_MODE_DEFAULTS" != "no"]) AM_CONDITIONAL([BUILD_BSDKM],[test "$ENABLED_BSDKM" = "yes"]) AM_CONDITIONAL([BUILD_KERNEL_MODULE],[test "$ENABLED_BSDKM" = "yes" || test "$ENABLED_LINUXKM" = "yes"]) AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"])