Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fscrypt: relax Kconfig dependencies for crypto API algorithms

Browse Source 
Even if FS encryption has strict functional dependencies on various
crypto algorithms and chaining modes. those dependencies could potentially
be satisified by other implementations than the generic ones, and no link
time dependency exists on the 'depends on' claused defined by
CONFIG_FS_ENCRYPTION_ALGS.

So let's relax these clauses to 'imply', so that the default behavior
is still to pull in those generic algorithms, but in a way that permits
them to be disabled again in Kconfig.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ard Biesheuvel 2021-04-21 09:55:10 +02:00 committed by Herbert Xu
parent d17d9227c3
commit a0fc20333e
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/crypto/Kconfig
View File

@ -14,16 +14,30 @@ config FS_ENCRYPTION
F2FS and UBIFS make use of this feature. F2FS and UBIFS make use of this feature.
# Filesystems supporting encryption must select this if FS_ENCRYPTION. This # Filesystems supporting encryption must select this if FS_ENCRYPTION. This
# allows the algorithms to be built as modules when all the filesystems are. # allows the algorithms to be built as modules when all the filesystems are,
# whereas selecting them from FS_ENCRYPTION would force them to be built-in.
#
# Note: this option only pulls in the algorithms that filesystem encryption
# needs "by default". If userspace will use "non-default" encryption modes such
# as Adiantum encryption, then those other modes need to be explicitly enabled
# in the crypto API; see Documentation/filesystems/fscrypt.rst for details.
#
# Also note that this option only pulls in the generic implementations of the
# algorithms, not any per-architecture optimized implementations. It is
# strongly recommended to enable optimized implementations too. It is safe to
# disable these generic implementations if corresponding optimized
# implementations will always be available too; for this reason, these are soft
# dependencies ('imply' rather than 'select'). Only disable these generic
# implementations if you're sure they will never be needed, though.
config FS_ENCRYPTION_ALGS config FS_ENCRYPTION_ALGS
tristate tristate
select CRYPTO_AES imply CRYPTO_AES
select CRYPTO_CBC imply CRYPTO_CBC
select CRYPTO_CTS imply CRYPTO_CTS
select CRYPTO_ECB imply CRYPTO_ECB
select CRYPTO_HMAC imply CRYPTO_HMAC
select CRYPTO_SHA512 imply CRYPTO_SHA512
select CRYPTO_XTS imply CRYPTO_XTS
config FS_ENCRYPTION_INLINE_CRYPT config FS_ENCRYPTION_INLINE_CRYPT
bool "Enable fscrypt to use inline crypto" bool "Enable fscrypt to use inline crypto"