[linux] 09/09: integrity: Delete ineffective kconfig assignments

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit d6692c5a99674cf1d795c023432a2dbe0ac6ac21
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jul 17 01:38:00 2017 +0100

    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.
---
 debian/config/config | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/config/config b/debian/config/config
index cb4ac37..17f4bd0 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -7093,7 +7093,6 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 ##
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 CONFIG_INTEGRITY_AUDIT=y
 
 ##
@@ -7114,10 +7113,6 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y
 # CONFIG_IMA_WRITE_POLICY is not set
 # CONFIG_IMA_READ_POLICY is not set
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git