Merge remote-tracking branch 'chrome-platform/for-next'

[deliverable/linux.git] / certs / Kconfig

diff --git a/certs/Kconfig b/certs/Kconfig
index f0f8a4433685aaa0c42ac776c590e9840e1ba52d..6ce51ede9e9b4617f62a5e2f3cc3aeda75f9a77f 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
@@ -55,4 +56,30 @@ config SYSTEM_EXTRA_CERTIFICATE_SIZE
          This is the number of bytes reserved in the kernel image for a
          certificate to be inserted.
 
+config SECONDARY_TRUSTED_KEYRING
+       bool "Provide a keyring to which extra trustable keys may be added"
+       depends on SYSTEM_TRUSTED_KEYRING
+       help
+         If set, provide a keyring to which extra keys may be added, provided
+         those keys are not blacklisted and are vouched for by a key built
+         into the kernel or already in the secondary trusted keyring.
+
+config SYSTEM_BLACKLIST_KEYRING
+       bool "Provide system-wide ring of blacklisted keys"
+       depends on KEYS
+       help
+         Provide a system keyring to which blacklisted keys can be added.
+         Keys in the keyring are considered entirely untrusted.  Keys in this
+         keyring are used by the module signature checking to reject loading
+         of modules signed with a blacklisted key.
+
+config SYSTEM_BLACKLIST_HASH_LIST
+       string "Hashes to be preloaded into the system blacklist keyring"
+       depends on SYSTEM_BLACKLIST_KEYRING
+       help
+         If set, this option should be the filename of a list of hashes in the
+         form "<hash>", "<hash>", ... .  This will be included into a C
+         wrapper to incorporate the list into the kernel.  Each <hash> should
+         be a string of hex digits.
+
 endmenu