Skip to content

Commit

Permalink
evm: remove TCG_TPM dependency
Browse files Browse the repository at this point in the history
All tristates selected by EVM(boolean) are forced to be builtin, except
in the TCG_TPM(tristate) dependency case. Arnaud Lacombe summarizes the
Kconfig bug as, "So it would seem direct dependency state influence the
state of reverse dependencies.."  For a detailed explanation, refer to
Arnaud Lacombe's posting http://lkml.org/lkml/2011/8/23/498.

With the "encrypted-keys: remove trusted-keys dependency" patch, EVM
can now be built without a dependency on TCG_TPM.  The trusted-keys
dependency requires trusted-keys to either be builtin or not selected.
This dependency will prevent the boolean/tristate mismatch from
occuring.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>,
             Randy Dunlap <rdunlap@xenotimenet>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
  • Loading branch information
Mimi Zohar committed Sep 14, 2011
1 parent 982e617 commit 1d71405
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions security/integrity/evm/Kconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
config EVM
boolean "EVM support"
depends on SECURITY && KEYS && TCG_TPM
depends on SECURITY && KEYS && (TRUSTED_KEYS=y || TRUSTED_KEYS=n)
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
Expand Down

0 comments on commit 1d71405

Please sign in to comment.