Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/config
Original file line number Diff line number Diff line change
Expand Up @@ -5810,8 +5810,8 @@ CONFIG_BFS_FS=m
##
## file: fs/btrfs/Kconfig
##
CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_BTRFS_FS=n
CONFIG_BTRFS_FS_POSIX_ACL=n
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
# CONFIG_BTRFS_ASSERT is not set
Expand Down
40 changes: 40 additions & 0 deletions upstream_patches/0005-disable-xxhash64.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
From linux-crypto-vger Tue Mar 03 06:05:09 2026
From: Joachim Vandersmissen <git () jvdsn ! com>
Date: Tue, 03 Mar 2026 06:05:09 +0000
To: linux-crypto-vger
Subject: [PATCH] crypto: testmgr - block Crypto API xxhash64 in FIPS mode
Message-Id: <20260303060509.246038-1-git () jvdsn ! com>
X-MARC-Message: https://marc.info/?l=linux-crypto-vger&m=177252066229289

xxhash64 is not a cryptographic hash algorithm, but is offered in the
same API (shash) as actual cryptographic hash algorithms such as
SHA-256. The Cryptographic Module Validation Program (CMVP), managing
FIPS certification, believes that this could cause confusion. xxhash64
must therefore be blocked in FIPS mode.

The only usage of xxhash64 in the kernel is btrfs. Commit fe11ac191ce0
("btrfs: switch to library APIs for checksums") recently modified the
btrfs code to use the lib/crypto API, avoiding the Kernel Cryptographic
API. Consequently, the removal of xxhash64 from the Crypto API in FIPS
mode should now have no impact on btrfs usage.

Signed-off-by: Joachim Vandersmissen <git@jvdsn.com>
---
crypto/testmgr.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 49b607f65f63..d7475d6000dd 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -5609,7 +5609,6 @@ static const struct alg_test_desc alg_test_descs[] = {
#endif
.alg = "xxhash64",
.test = alg_test_hash,
- .fips_allowed = 1,
.suite = {
.hash = __VECS(xxhash64_tv_template)
}
--
2.53.0

1 change: 1 addition & 0 deletions upstream_patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
0002-implement-FIPS-PCT-for-DH.patch
0003-implement-FIPS-PCT-for-ECDH.patch
0004-flag-instantiations-as-FIPS_compliant.patch
0005-disable-xxhash64.patch
Loading