From 2a26716073afca92ed2e44fcf61e14d59d9d5ee1 Mon Sep 17 00:00:00 2001
From: night1rider <backman23@live.com>
Date: Fri, 27 Feb 2026 12:37:49 -0700
Subject: [PATCH] Auto hash for kernel module builds

---
 conf/wolfssl-fips.conf.sample                 |  8 +++++
 .../wolfssl/wolfssl-linuxkm-fips.bb           | 35 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/conf/wolfssl-fips.conf.sample b/conf/wolfssl-fips.conf.sample
index 2c34885..572185a 100644
--- a/conf/wolfssl-fips.conf.sample
+++ b/conf/wolfssl-fips.conf.sample
@@ -23,6 +23,14 @@ PREFERRED_PROVIDER_wolfssl = "wolfssl-fips"
 # FIPS hash mode: "auto" (QEMU-based extraction) or "manual" (use static FIPS_HASH)
 WOLFSSL_FIPS_HASH_MODE ?= "manual"
 
+# Linux kernel module FIPS hash mode:
+#   "manual" - Use FIPS_HASH_LINUXKM from config (two-pass: build once to get hash, set it, rebuild)
+#   "auto"   - Use 'make module-with-matching-fips-hash' to compute and embed hash automatically
+#WOLFSSL_FIPS_HASH_MODE_LINUXKM ?= "auto"
+
+# Kernel module FIPS hash (only needed for manual mode)
+#FIPS_HASH_LINUXKM = ""
+
 # ============================================================================
 # FIPS Bundle Configuration - EDIT THESE VALUES
 # ============================================================================
diff --git a/recipes-wolfssl/wolfssl/wolfssl-linuxkm-fips.bb b/recipes-wolfssl/wolfssl/wolfssl-linuxkm-fips.bb
index 8eb9f0e..90b90d5 100644
--- a/recipes-wolfssl/wolfssl/wolfssl-linuxkm-fips.bb
+++ b/recipes-wolfssl/wolfssl/wolfssl-linuxkm-fips.bb
@@ -109,12 +109,45 @@ do_configure_fips_hash_check() {
             bbwarn "WOLFSSL_FIPS_HASH_MODE_LINUXKM=manual but FIPS_HASH_LINUXKM is not set"
         fi
     else
-        bbnote "Kernel module auto FIPS mode - hash will be determined by build"
+        bbnote "Kernel module auto FIPS mode - will use 'make module-with-matching-fips-hash-no-sign' to compute and embed the correct hash"
     fi
 }
 
 addtask do_configure_fips_hash_check after do_patch before do_configure
 
+do_compile() {
+    if [ "${WOLFSSL_FIPS_HASH_MODE_LINUXKM}" = "auto" ]; then
+        bbnote "Auto FIPS hash mode: running 'make module-with-matching-fips-hash-no-sign'"
+        bbnote "This will build the .ko, compute the FIPS hash, and patch it in-place."
+
+        # The linuxkm Makefile's libwolfssl-user-build step builds a host-native
+        # userspace wolfSSL library (it unsets CC/LD itself, uses host cc), but
+        # Yocto's cross-compilation LDFLAGS (containing --sysroot=...) and CPPFLAGS
+        # would leak through and break the host build. Unset them here — the kernel
+        # module build itself goes through 'make -C $(KERNEL_ROOT)' which is
+        # self-contained.
+        unset LDFLAGS
+        unset CPPFLAGS
+
+        # The linuxkm Makefile hardcodes 'cc' for host-native builds (linuxkm-fips-hash
+        # and libwolfssl-user-build). Yocto's build environment doesn't provide 'cc'
+        # on PATH. Create a temporary symlink using BUILD_CC (the host-native compiler).
+        mkdir -p ${B}/host-bin
+        ln -sf $(which ${BUILD_CC}) ${B}/host-bin/cc
+        export PATH="${B}/host-bin:${PATH}"
+
+        # Run from top-level source dir so that the autotools-generated Makefile
+        # exports KERNEL_ROOT, KERNEL_ARCH, and other configure-derived variables
+        # to the linuxkm/ sub-make.
+        oe_runmake module-with-matching-fips-hash-no-sign
+
+        # Clean up temporary symlink
+        rm -rf ${B}/host-bin
+    else
+        oe_runmake
+    fi
+}
+
 do_install() {
     install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra
     install -m 0644 ${S}/linuxkm/libwolfssl.ko \