From 0b024d2446474c6a7c47573af5a35db83f557ce3 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Tue, 9 Aug 2011 11:33:36 +1000
Subject: [PATCH] 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>
---
 security/integrity/evm/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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