summaryrefslogtreecommitdiffstats
path: root/security/integrity
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-08-09 11:33:36 +1000
committerJames Morris <jmorris@namei.org>2011-08-09 11:33:36 +1000
commit0b024d2446474c6a7c47573af5a35db83f557ce3 (patch)
tree56d1d380cd4f87581a0e276ee80cc52e438738b8 /security/integrity
parent5a2f3a02aea164f4f59c0c3497772090a411b462 (diff)
downloadlinux-stable-0b024d2446474c6a7c47573af5a35db83f557ce3.tar.gz
linux-stable-0b024d2446474c6a7c47573af5a35db83f557ce3.tar.bz2
linux-stable-0b024d2446474c6a7c47573af5a35db83f557ce3.zip
EVM: ensure trusted and encypted key symbols are available to EVM
Select trusted and encrypted keys if EVM is selected, to ensure the requisite symbols are available. Otherwise, these can be selected as modules while EVM is static, leading to a kernel build failure. Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/evm/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig
index 73f654099a4b..444877d9239b 100644
--- a/security/integrity/evm/Kconfig
+++ b/security/integrity/evm/Kconfig
@@ -1,9 +1,11 @@
config EVM
boolean "EVM support"
- depends on SECURITY && KEYS && ENCRYPTED_KEYS
+ depends on SECURITY && KEYS
select CRYPTO_HMAC
select CRYPTO_MD5
select CRYPTO_SHA1
+ select ENCRYPTED_KEYS
+ select TRUSTED_KEYS
default n
help
EVM protects a file's security extended attributes against