ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
Subsystems (4)
PATCH 1/1 ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
Time to remove "IMA_TRUSTED_KEYRING".
--- security/integrity/ima/Kconfig | 12 ------------ 1 file changed, 12 deletions(-)
security/integrity/ima/Kconfig +0 -12
@@ -248,18 +248,6 @@ config IMA_APPRAISE_MODSIG The modsig keyword can be used in the IMA policy to allow a hook to accept such signatures. -config IMA_TRUSTED_KEYRING - bool "Require all keys on the .ima keyring be signed (deprecated)" - depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING - depends on INTEGRITY_ASYMMETRIC_KEYS - select INTEGRITY_TRUSTED_KEYRING - default y - help - This option requires that all keys added to the .ima - keyring be signed by a key on the system trusted keyring. - - This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING - config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY bool "Permit keys validly signed by a built-in or secondary CA cert (EXPERIMENTAL)" depends on SYSTEM_TRUSTED_KEYRING
Signature · 1 line
2.31.1
Mimi Zohar
maintainerQuoted 4 lines · Nayna Jain
Time to remove "
IMA_TRUSTED_KEYRING".Fixes f4dc37785e9b ("integrity: define '.evm' as a builtin 'trusted' keyring") # v4.5+Signed-off-by Nayna Jain <[email protected]>
Thanks, Nayna. The patch is now queued in next-integrity-testing.
Signature · 3 lines
thanks, Mimi
PATCH 1/1 ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
In reply to Nayna JainHello,
There are two Kconfigs that depend on IMA_TRUSTED_KEYRING:IMA_LOAD_X509 and IMA_BLACKLIST_KEYRING. Removing IMA_TRUSTED_KEYRING makes them unreachable. Should they be removed too or should the dependency clauses be removed?
Quoted 8 lines · Oleksandr Tymoshenko
Hello,
There are two Kconfigs that depend on
IMA_TRUSTED_KEYRING:IMA_LOAD_X509andIMA_BLACKLIST_KEYRING. RemovingIMA_TRUSTED_KEYRINGmakes them unreachable. Should they be removed too or should the dependency clauses be removed?
Thanks Oleksandr for noticing this. Since IMA_TRUSTED_KEYRING is deprecated in favor of INTEGRITY_TRUSTED_KEYRING, I think the dependency clause should be updated to use INTEGRITY_TRUSTED_KEYRING.
Thanks & Regards,
- Nayna