Skip to content

Commit b2520f1

Browse files
committed
Ensure user-space wolfentropy builds of the v6 module compile the correct resource
1 parent b02ddde commit b2520f1

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11334,6 +11334,7 @@ AM_CONDITIONAL([BUILD_PKCS7],[test "x$ENABLED_PKCS7" = "xyes" || test "x$ENABLED
1133411334
AM_CONDITIONAL([BUILD_SMIME],[test "x$ENABLED_SMIME" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
1133511335
AM_CONDITIONAL([BUILD_HASHFLAGS],[test "x$ENABLED_HASHFLAGS" = "xyes"])
1133611336
AM_CONDITIONAL([BUILD_LINUXKM],[test "$ENABLED_LINUXKM" = "yes"])
11337+
AM_CONDITIONAL([BUILD_KERNEL_MODE_DEFAULTS],[test "$ENABLED_KERNEL_MODE_DEFAULTS" = "yes"])
1133711338
AM_CONDITIONAL([BUILD_BSDKM],[test "$ENABLED_BSDKM" = "yes"])
1133811339
AM_CONDITIONAL([BUILD_KERNEL_MODULE],[test "$ENABLED_BSDKM" = "yes" || test "$ENABLED_LINUXKM" = "yes"])
1133911340
AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"])

src/include.am

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,19 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += \
440440
wolfcrypt/src/hmac.c \
441441
wolfcrypt/src/random.c
442442

443+
if BUILD_FIPS_V6
443444
if BUILD_MEMUSE
445+
if BUILD_KERNEL_MODE_DEFAULTS
444446
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wolfentropy.c
445447
endif
448+
endif
449+
endif
450+
451+
if !BUILD_FIPS_V6
452+
if BUILD_MEMUSE
453+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wolfentropy.c
454+
endif
455+
endif
446456

447457
if BUILD_RNG_BANK
448458
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/rng_bank.c

0 commit comments

Comments
 (0)