Linux 6.9-rc1

[linux-2.6-microblaze.git] / certs / Kconfig

diff --git a/certs/Kconfig b/certs/Kconfig
index bf9b511..78307dc 100644 (file)
--- a/certs/Kconfig
+++ b/certs/Kconfig
@@ -30,9 +30,11 @@ config MODULE_SIG_KEY_TYPE_RSA
 config MODULE_SIG_KEY_TYPE_ECDSA
        bool "ECDSA"
        select CRYPTO_ECDSA
+       depends on !(MODULE_SIG_SHA256 || MODULE_SIG_SHA3_256)
        help
-        Use an elliptic curve key (NIST P384) for module signing. Consider
-        using a strong hash like sha256 or sha384 for hashing modules.
+        Use an elliptic curve key (NIST P384) for module signing. Use
+        a strong hash of same or higher bit length, i.e. sha384 or
+        sha512 for hashing modules.
 
         Note: Remove all ECDSA signing keys, e.g. certs/signing_key.pem,
         when falling back to building Linux 5.14 and older kernels.
@@ -43,7 +45,7 @@ config SYSTEM_TRUSTED_KEYRING
        bool "Provide system-wide ring of trusted keys"
        depends on KEYS
        depends on ASYMMETRIC_KEY_TYPE
-       depends on X509_CERTIFICATE_PARSER
+       depends on X509_CERTIFICATE_PARSER = y
        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
@@ -88,7 +90,21 @@ config SECONDARY_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.
+         into the kernel, machine keyring (if configured), or already in the
+         secondary trusted keyring.
+
+config SECONDARY_TRUSTED_KEYRING_SIGNED_BY_BUILTIN
+       bool "Only allow additional certs signed by keys on the builtin trusted keyring"
+       depends on SECONDARY_TRUSTED_KEYRING
+       help
+         If set, only certificates signed by keys on the builtin trusted
+         keyring may be loaded onto the secondary trusted keyring.
+
+         Note: The machine keyring, if configured, will be linked to the
+         secondary keyring.  When enabling this option, it is recommended
+         to also configure INTEGRITY_CA_MACHINE_KEYRING_MAX to prevent
+         linking code signing keys with imputed trust to the secondary
+         trusted keyring.
 
 config SYSTEM_BLACKLIST_KEYRING
        bool "Provide system-wide ring of blacklisted keys"