diff options
author | David Howells <dhowells@redhat.com> | 2016-02-03 15:04:40 +0000 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2016-02-10 10:13:27 +0000 |
commit | 50d35015ff0c00a464e35b109231145d2beec1bd (patch) | |
tree | 65b3adb01534e964eca9d8cdd49420c0e7f87c17 /security | |
parent | 5d2787cf0b210d2925e8d44e2e79241385249d6b (diff) | |
download | linux-stable-50d35015ff0c00a464e35b109231145d2beec1bd.tar.gz linux-stable-50d35015ff0c00a464e35b109231145d2beec1bd.tar.bz2 linux-stable-50d35015ff0c00a464e35b109231145d2beec1bd.zip |
KEYS: CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option
CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option as /proc/keys is now
mandatory if the keyrings facility is enabled (it's used by libkeyutils in
userspace).
The defconfig references were removed with:
perl -p -i -e 's/CONFIG_KEYS_DEBUG_PROC_KEYS=y\n//' \
`git grep -l CONFIG_KEYS_DEBUG_PROC_KEYS=y`
and the integrity Kconfig fixed by hand.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Andreas Ziegler <andreas.ziegler@fau.de>
cc: Dmitry Kasatkin <dmitry.kasatkin@huawei.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig index 21d756832b75..7543398b79e3 100644 --- a/security/integrity/Kconfig +++ b/security/integrity/Kconfig @@ -45,7 +45,6 @@ config INTEGRITY_TRUSTED_KEYRING bool "Require all keys on the integrity keyrings be signed" depends on SYSTEM_TRUSTED_KEYRING depends on INTEGRITY_ASYMMETRIC_KEYS - select KEYS_DEBUG_PROC_KEYS default y help This option requires that all keys added to the .ima and |