Merge tag 'media/v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux.git] / fs / crypto / Kconfig

diff --git a/fs/crypto/Kconfig b/fs/crypto/Kconfig
index ff5a1746cbae4cc2f9fa26c30b6e85fb7f56da28..8046d7c7a3e9ce95dbade140c9367b2f9f1e34e5 100644 (file)
--- a/fs/crypto/Kconfig
+++ b/fs/crypto/Kconfig
@@ -2,13 +2,8 @@
 config FS_ENCRYPTION
        bool "FS Encryption (Per-file encryption)"
        select CRYPTO
-       select CRYPTO_AES
-       select CRYPTO_CBC
-       select CRYPTO_ECB
-       select CRYPTO_XTS
-       select CRYPTO_CTS
-       select CRYPTO_SHA512
-       select CRYPTO_HMAC
+       select CRYPTO_HASH
+       select CRYPTO_SKCIPHER
        select KEYS
        help
          Enable encryption of files and directories.  This
@@ -16,3 +11,16 @@ config FS_ENCRYPTION
          efficient since it avoids caching the encrypted and
          decrypted pages in the page cache.  Currently Ext4,
          F2FS and UBIFS make use of this feature.
+
+# Filesystems supporting encryption must select this if FS_ENCRYPTION.  This
+# allows the algorithms to be built as modules when all the filesystems are.
+config FS_ENCRYPTION_ALGS
+       tristate
+       select CRYPTO_AES
+       select CRYPTO_CBC
+       select CRYPTO_CTS
+       select CRYPTO_ECB
+       select CRYPTO_HMAC
+       select CRYPTO_SHA256
+       select CRYPTO_SHA512
+       select CRYPTO_XTS