projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next
[cascardo/linux.git]
/
security
/
integrity
/
evm
/
Kconfig
diff --git
a/security/integrity/evm/Kconfig
b/security/integrity/evm/Kconfig
index
913532c
..
e825e0a
100644
(file)
--- a/
security/integrity/evm/Kconfig
+++ b/
security/integrity/evm/Kconfig
@@
-44,7
+44,7
@@
config EVM_EXTRA_SMACK_XATTRS
config EVM_LOAD_X509
bool "Load an X509 certificate onto the '.evm' trusted keyring"
- depends on INTEGRITY_TRUSTED_KEYRING
+ depends on
EVM &&
INTEGRITY_TRUSTED_KEYRING
default n
help
Load an X509 certificate onto the '.evm' trusted keyring.