-
Notifications
You must be signed in to change notification settings - Fork 958
add wolfentropy.ko build — SP 800-90B entropy source kernel module #10144
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
lealem47
wants to merge
4
commits into
wolfSSL:master
Choose a base branch
from
lealem47:standalone_wolfentropy_ko
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
d1bade9
Add --enable-wolfentropy=random_c option for official ESV code
lealem47 9c511b3
add standalone wolfentropy.ko build target that provides only the wc_…
lealem47 5125a3e
Fix for: ./fips-check.sh wolfentropy keep
lealem47 5579609
Change default --enable-linuxkm entropy source to wolfentropy.ko
lealem47 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -368,89 +368,17 @@ wolfentropy) | |||||||
| FIPS_REPO_TAG='WCv6.0.0-RC4' | ||||||||
| ASM_PICKUPS_TAG='WCv6.0.0-RC4' | ||||||||
| WOLF_ENTROPY_TAG='wolfEntropy2' | ||||||||
| FIPS_OPTION='v6' | ||||||||
| FIPS_OPTION='disabled --enable-wolfentropy=random_c --disable-shake128 | ||||||||
| --disable-shake256' | ||||||||
|
Comment on lines
+371
to
+372
|
||||||||
| FIPS_OPTION='disabled --enable-wolfentropy=random_c --disable-shake128 | |
| --disable-shake256' | |
| FIPS_OPTION='disabled --enable-wolfentropy=random_c --disable-shake128 --disable-shake256' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -463,10 +463,90 @@ endif | |
| install modules_install: | ||
| +$(MAKE) $(QFLAG) --no-silent -C $(KERNEL_ROOT) M=$(MODULE_TOP) src=$(SRC_TOP) INSTALL_MOD_DIR=wolfssl modules_install | ||
|
|
||
| # wolfentropy.ko -- minimal SP 800-90B entropy source module. | ||
| # | ||
| # Built from a fixed, minimal set of wolfcrypt sources compiled with the same | ||
| # WOLFSSL_CFLAGS as the main module (which already carries -DHAVE_ENTROPY_MEMUSE | ||
| # when --enable-wolfentropy was passed to configure). Only wc_Entropy_Get, | ||
| # wc_Entropy_GetRawEntropy, and wc_Entropy_OnDemandTest are exported; all other | ||
| # wolfcrypt symbols (SHA3, mutexes, wolfCrypt_Init, ...) remain unexported, so | ||
| # loading wolfentropy.ko alongside libwolfssl.ko causes no symbol collisions. | ||
| # | ||
| # The build runs in a separate subdirectory ($(MODULE_TOP)/wolfentropy/) that | ||
| # mirrors the layout used by the main module build. | ||
|
|
||
| WOLFENTROPY_MODULE_TOP := $(MODULE_TOP)/wolfentropy | ||
|
|
||
| # Minimal set of wolfcrypt objects needed for Entropy_Init / wc_Entropy_Get. | ||
| # random.c uses SHA256 internally for the DRBG counter-mode update, so | ||
| # sha256.o must be included. | ||
| # Add wolfcrypt/src/sha3_asm.o here for platforms with SHA3 ASM acceleration. | ||
| WOLFENTROPY_OBJ_FILES := \ | ||
| wolfcrypt/src/random.o \ | ||
| wolfcrypt/src/sha256.o \ | ||
| wolfcrypt/src/sha3.o \ | ||
| wolfcrypt/src/wc_port.o \ | ||
| wolfcrypt/src/memory.o \ | ||
| wolfcrypt/src/logging.o \ | ||
| linuxkm/linuxkm_memory.o | ||
|
|
||
| # Inherit the same compiler flags as the main module; configure already added | ||
| # -DHAVE_ENTROPY_MEMUSE (and -DWOLFSSL_SHA3) when --enable-wolfentropy was set. | ||
| # WOLFSSL_LINUXKM_USE_MUTEXES: use kernel mutexes directly; wolfentropy.ko | ||
| # does not have the PIE redirect table that wc_lkm_LockMutex requires. | ||
| WOLFENTROPY_CFLAGS := $(WOLFSSL_CFLAGS) -DWOLFSSL_LINUXKM_USE_MUTEXES | ||
|
|
||
| export WOLFENTROPY_OBJ_FILES WOLFENTROPY_CFLAGS | ||
|
|
||
| .PHONY: wolfentropy wolfentropy.ko | ||
| wolfentropy: wolfentropy.ko | ||
|
|
||
| wolfentropy.ko: | ||
| @set -e | ||
|
||
| @if test -z '$(KERNEL_ROOT)'; then echo '$$KERNEL_ROOT is unset' >&2; exit 1; fi | ||
| @if test -z '$(AM_CFLAGS)$(CFLAGS)'; then echo '$$AM_CFLAGS and $$CFLAGS are both unset.' >&2; exit 1; fi | ||
| @mkdir -p '$(WOLFENTROPY_MODULE_TOP)/linuxkm' | ||
| @# Symlink Kbuild.entropy as the Kbuild file for this build directory. | ||
| @ln -sf '$(MODULE_TOP)/Kbuild.entropy' '$(WOLFENTROPY_MODULE_TOP)/Kbuild' | ||
| @# Symlink all linuxkm .c/.h sources (includes module_hooks_entropy.c, | ||
| @# module_exports_entropy.c, linuxkm_memory.c, get_thread_size.c, ...). | ||
| @function resolved_link_is_equal() { [[ -L "$$1" && "$$(readlink -f "$$1")" == "$$(readlink -f "$$2")" ]]; } | ||
| @resolved_link_is_equal \ | ||
| '$(WOLFENTROPY_MODULE_TOP)/linuxkm/module_hooks_entropy.c' \ | ||
| '$(MODULE_TOP)/module_hooks_entropy.c' || \ | ||
| cp $(vflag) --no-dereference --symbolic-link --no-clobber \ | ||
|
Comment on lines
+513
to
+517
|
||
| '$(MODULE_TOP)'/*.[ch] '$(WOLFENTROPY_MODULE_TOP)/linuxkm/' | ||
| @# Symlink wolfcrypt source tree. | ||
| @resolved_link_is_equal \ | ||
| '$(WOLFENTROPY_MODULE_TOP)/wolfcrypt/src/random.c' \ | ||
| '$(SRC_TOP)/wolfcrypt/src/random.c' || \ | ||
| cp $(vflag) --no-dereference --symbolic-link --no-clobber \ | ||
|
||
| --recursive '$(SRC_TOP)/wolfcrypt' '$(WOLFENTROPY_MODULE_TOP)/' | ||
| +$(MAKE) $(QFLAG) --no-print-directory --no-silent \ | ||
| ARCH='$(KERNEL_ARCH)' $(OVERRIDE_PATHS) $(CROSS_COMPILE) \ | ||
| -C '$(KERNEL_ROOT)' M='$(WOLFENTROPY_MODULE_TOP)' \ | ||
| WOLFENTROPY_OBJ_FILES='$(WOLFENTROPY_OBJ_FILES)' \ | ||
| WOLFENTROPY_CFLAGS='$(WOLFENTROPY_CFLAGS)' \ | ||
| WOLFSSL_ASFLAGS='$(WOLFSSL_ASFLAGS)' \ | ||
| KERNEL_ARCH='$(KERNEL_ARCH)' \ | ||
| CFLAGS_SIMD_DISABLE='$(CFLAGS_SIMD_DISABLE)' \ | ||
| CFLAGS_FPU_DISABLE='$(CFLAGS_FPU_DISABLE)' \ | ||
| ASFLAGS_FPUSIMD_DISABLE='$(ASFLAGS_FPUSIMD_DISABLE)' \ | ||
| $(KBUILD_EXTRA_FLAGS) CC_FLAGS_FTRACE= | ||
| @cp '$(WOLFENTROPY_MODULE_TOP)/wolfentropy.ko' . 2>/dev/null || true | ||
|
|
||
| .PHONY: wolfentropy-clean | ||
| wolfentropy-clean: | ||
| +$(MAKE) $(QFLAG) --no-silent -C $(KERNEL_ROOT) \ | ||
| M='$(WOLFENTROPY_MODULE_TOP)' src='$(WOLFENTROPY_MODULE_TOP)' clean \ | ||
| 2>/dev/null || true | ||
| $(RM) -rf '$(WOLFENTROPY_MODULE_TOP)' | ||
| $(RM) -f wolfentropy.ko | ||
|
|
||
| .PHONY: clean | ||
| # note, must supply $(MODULE_TOP) as the src value for clean so that Kbuild is included, else | ||
| # the top Makefile (which is not for the kernel build) would be included here. | ||
| clean: | ||
| clean: wolfentropy-clean | ||
| +$(MAKE) $(QFLAG) --no-silent -C $(KERNEL_ROOT) M=$(MODULE_TOP) src=$(MODULE_TOP) clean | ||
| $(RM) -rf '$(MODULE_TOP)/linuxkm' | ||
| $(RM) -rf '$(MODULE_TOP)/wolfcrypt' | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -397,9 +397,27 @@ void wc_linuxkm_relax_long_loop(void) { | |||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| #if defined(WC_LINUXKM_WOLFENTROPY_IN_GLUE_LAYER) | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| /* When building without the wolfentropy source (HAVE_ENTROPY_MEMUSE not set), | ||||||||||||||||||||||||||||||||
| * wc_Entropy_Get and MAX_ENTROPY_BITS are not declared via the normal header | ||||||||||||||||||||||||||||||||
| * chain. Provide the declarations here at file scope so the compiler sees | ||||||||||||||||||||||||||||||||
| * them before the call below. | ||||||||||||||||||||||||||||||||
| */ | ||||||||||||||||||||||||||||||||
| #ifndef HAVE_ENTROPY_MEMUSE | ||||||||||||||||||||||||||||||||
| #ifndef MAX_ENTROPY_BITS | ||||||||||||||||||||||||||||||||
| #define MAX_ENTROPY_BITS 256 | ||||||||||||||||||||||||||||||||
| #endif | ||||||||||||||||||||||||||||||||
|
Comment on lines
+401
to
+408
|
||||||||||||||||||||||||||||||||
| * wc_Entropy_Get and MAX_ENTROPY_BITS are not declared via the normal header | |
| * chain. Provide the declarations here at file scope so the compiler sees | |
| * them before the call below. | |
| */ | |
| #ifndef HAVE_ENTROPY_MEMUSE | |
| #ifndef MAX_ENTROPY_BITS | |
| #define MAX_ENTROPY_BITS 256 | |
| #endif | |
| * pull MAX_ENTROPY_BITS from the shared wolfentropy header instead of | |
| * duplicating the value locally, so the glue layer stays in sync with | |
| * wolfentropy. Keep wc_Entropy_Get weak so we can report a missing | |
| * wolfentropy.ko at runtime. | |
| */ | |
| #ifndef HAVE_ENTROPY_MEMUSE | |
| #include <wolfssl/wolfcrypt/wolfentropy.h> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PR description says
BUILD_WOLFENTROPY_KOis enabled when--enable-linuxkm+ entropy memuse are both active, but the conditional currently enables it for any LinuxKM build. Either update the conditional to reflect the documented gating (e.g., require the entropy configuration that makeswolfentropy.kobuildable), or update the PR description/usage so users don’t get awolfentropytarget that can fail under default/non-entropy configurations.