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>

diff --git a/certs/Kconfig b/certs/Kconfig
index f0f8a4433685aaa0c42ac776c590e9840e1ba52d..743d480f5f6f8e2aeb2d76890b8b5b205307ef25 100644 (file)
--- a/certs/Kconfig
+++ b/certs/Kconfig
@@ -17,6 +17,7 @@ config MODULE_SIG_KEY
 config SYSTEM_TRUSTED_KEYRING
        bool "Provide system-wide ring of trusted keys"
        depends on KEYS
+       depends on ASYMMETRIC_KEY_TYPE
        help
          Provide a system keyring to which trusted keys can be added.  Keys in
          the keyring are considered to be trusted.  Keys may be added at will

diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig
index f7d2ef9789d8d7d8006be0051002fb4bb4eb4e19..e28e912000a71ab701f61fc09faa9570f81afe09 100644 (file)
--- a/crypto/asymmetric_keys/Kconfig
+++ b/crypto/asymmetric_keys/Kconfig
@@ -1,5 +1,5 @@
 menuconfig ASYMMETRIC_KEY_TYPE
-       tristate "Asymmetric (public-key cryptographic) key type"
+       bool "Asymmetric (public-key cryptographic) key type"
        depends on KEYS
        help
          This option provides support for a key type that holds the data for