Skip to content

Commit a19bcde

Browse files
committed
Revert "fsverity: relax build time dependency on CRYPTO_SHA256"
This reverts commit e3a606f because it allows people to create broken configurations that enable FS_VERITY but not SHA-256 support. The commit did allow people to disable the generic SHA-256 implementation when it's not needed. But that at best allowed saving a bit of code. In the real world people are unlikely to intentionally and correctly make such a tweak anyway, as they tend to just be confused by what all the different crypto kconfig options mean. Of course we really need the crypto API to enable the correct implementations automatically, but that's for a later fix. Acked-by: Ard Biesheuvel <[email protected]> Cc: Herbert Xu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Eric Biggers <[email protected]>
1 parent 212df80 commit a19bcde

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

fs/verity/Kconfig

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ config FS_VERITY
44
bool "FS Verity (read-only file-based authenticity protection)"
55
select CRYPTO
66
select CRYPTO_HASH_INFO
7-
# SHA-256 is implied as it's intended to be the default hash algorithm.
7+
# SHA-256 is selected as it's intended to be the default hash algorithm.
88
# To avoid bloat, other wanted algorithms must be selected explicitly.
9-
# Note that CRYPTO_SHA256 denotes the generic C implementation, but
10-
# some architectures provided optimized implementations of the same
11-
# algorithm that may be used instead. In this case, CRYPTO_SHA256 may
12-
# be omitted even if SHA-256 is being used.
13-
imply CRYPTO_SHA256
9+
select CRYPTO_SHA256
1410
help
1511
This option enables fs-verity. fs-verity is the dm-verity
1612
mechanism implemented at the file level. On supported

0 commit comments

Comments
 (0)