integrity: Delete ineffective kconfig assignments

We didn't enable INTEGRITY_SIGNATURE and INTEGRITY_ASYMMETRIC_KEYS,
which are dependencies for these.  According to bug #865277, we
should not enable them.
This commit is contained in:
Ben Hutchings 2017-07-17 01:38:00 +01:00
parent 4e322430ec
commit d6692c5a99
1 changed files with 0 additions and 5 deletions

View File

@ -7093,7 +7093,6 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
## ##
CONFIG_INTEGRITY=y CONFIG_INTEGRITY=y
# CONFIG_INTEGRITY_SIGNATURE is not set # CONFIG_INTEGRITY_SIGNATURE is not set
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY_AUDIT=y CONFIG_INTEGRITY_AUDIT=y
## ##
@ -7114,10 +7113,6 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_WRITE_POLICY is not set # CONFIG_IMA_WRITE_POLICY is not set
# CONFIG_IMA_READ_POLICY is not set # CONFIG_IMA_READ_POLICY is not set
CONFIG_IMA_APPRAISE=y CONFIG_IMA_APPRAISE=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_BLACKLIST_KEYRING=y
# CONFIG_IMA_LOAD_X509 is not set
# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
## ##
## file: security/keys/Kconfig ## file: security/keys/Kconfig