From 90630939937bd8fa6c0227dbb69491d1e4f0eb7e Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Wed, 26 Feb 2025 07:38:45 -0700
Subject: [PATCH] Disable XTS-384 as an allowed use in FIPS mode

---
 fips-check.sh       | 4 ++--
 wolfcrypt/src/aes.c | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fips-check.sh b/fips-check.sh
index b3472f4f38..462990be40 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -240,9 +240,9 @@ linuxv5|linuxv5.2.1)
   )
   ;;
 v6.0.0)
-  WOLF_REPO_TAG='WCv6.0.0-RC3'
+  WOLF_REPO_TAG='WCv6.0.0-RC4'
   FIPS_REPO_TAG='WCv6.0.0-RC4'
-  ASM_PICKUPS_TAG='WCv6.0.0-RC3'
+  ASM_PICKUPS_TAG='WCv6.0.0-RC4'
   FIPS_OPTION='v6'
   FIPS_FILES=(
     "wolfcrypt/src/fips.c:${FIPS_REPO_TAG}"
diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index 2cba921934..c6682214e1 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -12818,7 +12818,12 @@ int wc_AesXtsSetKeyNoInit(XtsAes* aes, const byte* key, word32 len, int dir)
     }
 
     if ((len != (AES_128_KEY_SIZE*2)) &&
+#ifndef HAVE_FIPS
+        /* XTS-384 not allowed by FIPS and can not be treated like
+         * RSA-4096 bit keys back in the day, can not vendor affirm
+         * the use of 2 concatenated 192-bit keys (XTS-384) */
         (len != (AES_192_KEY_SIZE*2)) &&
+#endif
         (len != (AES_256_KEY_SIZE*2)))
     {
         WOLFSSL_MSG("Unsupported key size");