From e7297493d4a0dcc2aeffc63c9e04640d5c54fa27 Mon Sep 17 00:00:00 2001
From: Lealem Amedie <lealemta47@gmail.com>
Date: Wed, 29 Apr 2026 11:09:33 -0600
Subject: [PATCH] --enable-compkey allowed with v5

---
 configure.ac | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 186c23c457..d324fb30d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1659,7 +1659,6 @@ if test "$ENABLED_TAILSCALE" = "yes"
 then
     enable_wolfguard=yes
     test "x$enable_sp" = "x" && enable_sp="yes,256"
-    enable_compkey=yes
     enable_opensslall=yes
     enable_alpn=yes
     enable_sni=yes
@@ -1687,9 +1686,9 @@ then
     test "$enable_aesgcm" = "" && enable_aesgcm=yes
     test "$enable_base64encode" = "" && enable_base64encode=yes
     test "$enable_base16" = "" && enable_base16=yes
+    test "$enable_compkey" = "" && enable_compkey=yes
     if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -ge 6
     then
-        test "$enable_compkey" = "" && enable_compkey=yes
         test "$enable_aesgcm_stream" = "" && enable_aesgcm_stream=yes
     fi
 fi
@@ -4938,8 +4937,7 @@ AC_ARG_ENABLE([compkey],
     [ ENABLED_COMPKEY=no ]
     )
 
-if (test "$ENABLED_WPAS" = "yes" || test "$ENABLED_OPENSSLALL" = "yes") &&
-   (test "$HAVE_FIPS_VERSION" != "5")
+if (test "$ENABLED_WPAS" = "yes" || test "$ENABLED_OPENSSLALL" = "yes")
 then
     ENABLED_COMPKEY=yes
 fi
@@ -6836,11 +6834,6 @@ AS_CASE([$FIPS_VERSION],
                (test "$FIPS_VERSION" != "v5-dev" || test "$enable_keygen" != "no")],
             [ENABLED_KEYGEN="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"])
 
-        AS_IF([test "$ENABLED_COMPKEY" = "yes" &&
-               ! (test "$FIPS_VERSION" = "v5-dev" && test "$enable_compkey" = "yes")],
-            [AC_MSG_WARN([Forcing off compkey for FIPS ${FIPS_VERSION}.])
-             ENABLED_COMPKEY="no"])
-
         AS_IF([test "$ENABLED_SHA224" != "yes" &&
                (test "$FIPS_VERSION" != "v5-dev" || test "$enable_sha224" != "no")],
             [ENABLED_SHA224="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA224"])