Merge pull request #8683 from douzzer/20250416-linuxkm-FIPS-wrappers

philljj · web-flow · commit 4906974fad50 · 2025-04-16T23:18:04.000-05:00
20250416-linuxkm-FIPS-wrappers
diff --git a/linuxkm/lkcapi_ecdh_glue.c b/linuxkm/lkcapi_ecdh_glue.c
@@ -523,8 +523,10 @@ static int km_ecdh_compute_shared_secret(struct kpp_request *req)
         goto ecdh_shared_secret_end;
     }
 
+    PRIVATE_KEY_UNLOCK();
     err = wc_ecc_shared_secret(ctx->key, ecc_pub, shared_secret,
                                &shared_secret_len);
+    PRIVATE_KEY_LOCK();
 
     if (unlikely(err || shared_secret_len != ctx->curve_len)) {
         #ifdef WOLFKM_DEBUG_ECDH
diff --git a/linuxkm/module_hooks.c b/linuxkm/module_hooks.c
@@ -27,8 +27,6 @@
 #endif
 #endif
 
-#define FIPS_NO_WRAPPERS
-
 #define WOLFSSL_LINUXKM_NEED_LINUX_CURRENT
 
 #include <wolfssl/wolfcrypt/libwolfssl_sources.h>

Original file line number	Diff line number	Diff line change
`@@ -523,8 +523,10 @@ static int km_ecdh_compute_shared_secret(struct kpp_request *req)`
`523`	`523`	`goto ecdh_shared_secret_end;`
`524`	`524`	`}`
`525`	`525`
	`526`	`+ PRIVATE_KEY_UNLOCK();`
`526`	`527`	`err = wc_ecc_shared_secret(ctx->key, ecc_pub, shared_secret,`
`527`	`528`	`&shared_secret_len);`
	`529`	`+ PRIVATE_KEY_LOCK();`
`528`	`530`
`529`	`531`	`if (unlikely(err \|\| shared_secret_len != ctx->curve_len)) {`
`530`	`532`	`#ifdef WOLFKM_DEBUG_ECDH`