Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index e0f08b52e4ab440933c9f72120092b8bcd527b46..51bd5a0b69ae80440470b9aa9ed6eca0e38f66a6 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -38,7 +38,9 @@ config TRUSTED_KEYS
 
 config ENCRYPTED_KEYS
        tristate "ENCRYPTED KEYS"
-       depends on KEYS && TRUSTED_KEYS
+       depends on KEYS
+       select CRYPTO
+       select CRYPTO_HMAC
        select CRYPTO_AES
        select CRYPTO_CBC
        select CRYPTO_SHA256
@@ -186,7 +188,7 @@ source security/smack/Kconfig
 source security/tomoyo/Kconfig
 source security/apparmor/Kconfig
 
-source security/integrity/ima/Kconfig
+source security/integrity/Kconfig
 
 choice
        prompt "Default security module"