aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-08-08 21:33:36 -0400
committerJames Morris <jmorris@namei.org>2011-08-08 21:33:36 -0400
commit0b024d2446474c6a7c47573af5a35db83f557ce3 (patch)
tree56d1d380cd4f87581a0e276ee80cc52e438738b8 /security
parent5a2f3a02aea164f4f59c0c3497772090a411b462 (diff)
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')
-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 @@
1config EVM 1config EVM
2 boolean "EVM support" 2 boolean "EVM support"
3 depends on SECURITY && KEYS && ENCRYPTED_KEYS 3 depends on SECURITY && KEYS
4 select CRYPTO_HMAC 4 select CRYPTO_HMAC
5 select CRYPTO_MD5 5 select CRYPTO_MD5
6 select CRYPTO_SHA1 6 select CRYPTO_SHA1
7 select ENCRYPTED_KEYS
8 select TRUSTED_KEYS
7 default n 9 default n
8 help 10 help
9 EVM protects a file's security extended attributes against 11 EVM protects a file's security extended attributes against