Integrity subsystem got lots of options and takes more than half of security menu.
This patch moves integrity subsystem options to a separate menu. It does not affect existing configuration. Re-configuration is not needed. Signed-off-by: Dmitry Kasatkin <[email protected]> --- security/integrity/Kconfig | 11 ++++++++--- security/integrity/evm/Kconfig | 9 +-------- security/integrity/ima/Kconfig | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig index f79d853..b16c9cd 100644 --- a/security/integrity/Kconfig +++ b/security/integrity/Kconfig @@ -1,7 +1,10 @@ # -config INTEGRITY - def_bool y - depends on IMA || EVM +menuconfig INTEGRITY + bool "Integrity Subsystem" + depends on SECURITY + default y + +if INTEGRITY config INTEGRITY_SIGNATURE boolean "Digital signature verification using multiple keyrings" @@ -46,3 +49,5 @@ config INTEGRITY_AUDIT source security/integrity/ima/Kconfig source security/integrity/evm/Kconfig + +endif # if INTEGRITY diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig index d606f3d..df20a2f 100644 --- a/security/integrity/evm/Kconfig +++ b/security/integrity/evm/Kconfig @@ -1,6 +1,6 @@ config EVM boolean "EVM support" - depends on SECURITY + depends on INTEGRITY select KEYS select ENCRYPTED_KEYS select CRYPTO_HMAC @@ -12,10 +12,6 @@ config EVM If you are unsure how to answer this question, answer N. -if EVM - -menu "EVM options" - config EVM_ATTR_FSUUID bool "FSUUID (version 2)" default y @@ -47,6 +43,3 @@ config EVM_EXTRA_SMACK_XATTRS additional info to the calculation, requires existing EVM labeled file systems to be relabeled. -endmenu - -endif diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 81a2797..5f95e50 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -2,8 +2,7 @@ # config IMA bool "Integrity Measurement Architecture(IMA)" - depends on SECURITY - select INTEGRITY + depends on INTEGRITY select SECURITYFS select CRYPTO select CRYPTO_HMAC -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
