diff options
| author | David Howells <dhowells@redhat.com> | 2016-02-03 10:04:40 -0500 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-02-10 05:13:27 -0500 |
| commit | 50d35015ff0c00a464e35b109231145d2beec1bd (patch) | |
| tree | 65b3adb01534e964eca9d8cdd49420c0e7f87c17 /security/integrity | |
| parent | 5d2787cf0b210d2925e8d44e2e79241385249d6b (diff) | |
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/integrity')
| -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 | |||
| 45 | bool "Require all keys on the integrity keyrings be signed" | 45 | bool "Require all keys on the integrity keyrings be signed" |
| 46 | depends on SYSTEM_TRUSTED_KEYRING | 46 | depends on SYSTEM_TRUSTED_KEYRING |
| 47 | depends on INTEGRITY_ASYMMETRIC_KEYS | 47 | depends on INTEGRITY_ASYMMETRIC_KEYS |
| 48 | select KEYS_DEBUG_PROC_KEYS | ||
| 49 | default y | 48 | default y |
| 50 | help | 49 | help |
| 51 | This option requires that all keys added to the .ima and | 50 | This option requires that all keys added to the .ima and |