aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2020-12-09 12:28:31 +0000
committerDaniel Golle <daniel@makrotopia.org>2020-12-14 17:25:14 +0000
commit7b85dd3788fd427ae95c6029b7a9177fd379ffea (patch)
tree247697d60c25f5ba86161bb4dbe9eeb98d2de122
parent0f43961eef8cd54ca0f5d151b0672014e0d64470 (diff)
downloadupstream-7b85dd3788fd427ae95c6029b7a9177fd379ffea.tar.gz
upstream-7b85dd3788fd427ae95c6029b7a9177fd379ffea.tar.bz2
upstream-7b85dd3788fd427ae95c6029b7a9177fd379ffea.zip
kernel: update and clean kernel keyring options
Add KERNEL_KEYS_REQUEST_CACHE option. 'tristate' (ie. module builds) are not valid in Config-kernel.in, hence remove tristate KERNEL_ENCRYPTED_KEYS. It will be readded as a kernel module in a follow-up commit. Fixes: 39d817cf38 ("Add config symbols for kernel keyring support") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--config/Config-kernel.in26
1 files changed, 13 insertions, 13 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 1cd9da4d12..b5eba78719 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -531,23 +531,23 @@ if KERNEL_DEVTMPFS
endif
config KERNEL_KEYS
- bool "Enable kernel access key retention support"
- default n
+ bool "Enable kernel access key retention support"
+ default n
config KERNEL_PERSISTENT_KEYRINGS
- bool "Enable kernel persistent keyrings"
- depends on KERNEL_KEYS
- default n
+ bool "Enable kernel persistent keyrings"
+ depends on KERNEL_KEYS
+ default n
+
+config KERNEL_KEYS_REQUEST_CACHE
+ bool "Enable temporary caching of the last request_key() result"
+ depends on KERNEL_KEYS
+ default n
config KERNEL_BIG_KEYS
- bool "Enable large payload keys on kernel keyrings"
- depends on KERNEL_KEYS
- default n
-
-config KERNEL_ENCRYPTED_KEYS
- tristate "Enable keys with encrypted payloads on kernel keyrings"
- depends on KERNEL_KEYS
- default n
+ bool "Enable large payload keys on kernel keyrings"
+ depends on KERNEL_KEYS
+ default n
#
# CGROUP support symbols