aboutsummaryrefslogtreecommitdiffstats
path: root/certs
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-04-06 11:14:26 -0400
committerDavid Howells <dhowells@redhat.com>2016-04-11 17:43:24 -0400
commit99716b7cae8263e1c7e7c1987e95d8f67071ab3e (patch)
treef1d551d31bd36b6e3594664c95183af544984c1d /certs
parentcfb664ff2b71fbbdc438b8e6db2a1412440432a2 (diff)
KEYS: Make the system trusted keyring depend on the asymmetric key type
Make the system trusted keyring depend on the asymmetric key type as there's not a lot of point having it if you can't then load asymmetric keys onto it. This requires the ASYMMETRIC_KEY_TYPE to be made a bool, not a tristate, as the Kconfig language doesn't then correctly force ASYMMETRIC_KEY_TYPE to 'y' rather than 'm' if SYSTEM_TRUSTED_KEYRING is 'y'. Making SYSTEM_TRUSTED_KEYRING *select* ASYMMETRIC_KEY_TYPE instead doesn't work as the Kconfig interpreter then wrongly complains about dependency loops. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'certs')
-rw-r--r--certs/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/certs/Kconfig b/certs/Kconfig
index f0f8a4433685..743d480f5f6f 100644
--- a/certs/Kconfig
+++ b/certs/Kconfig
@@ -17,6 +17,7 @@ config MODULE_SIG_KEY
17config SYSTEM_TRUSTED_KEYRING 17config SYSTEM_TRUSTED_KEYRING
18 bool "Provide system-wide ring of trusted keys" 18 bool "Provide system-wide ring of trusted keys"
19 depends on KEYS 19 depends on KEYS
20 depends on ASYMMETRIC_KEY_TYPE
20 help 21 help
21 Provide a system keyring to which trusted keys can be added. Keys in 22 Provide a system keyring to which trusted keys can be added. Keys in
22 the keyring are considered to be trusted. Keys may be added at will 23 the keyring are considered to be trusted. Keys may be added at will