Skip to content

Commit 5087fd9

Browse files
naynajainmimizohar
authored andcommitted
ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
Time to remove "IMA_TRUSTED_KEYRING". Fixes: f4dc377 ("integrity: define '.evm' as a builtin 'trusted' keyring") # v4.5+ Signed-off-by: Nayna Jain <nayna@linux.ibm.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
1 parent 5d0c230 commit 5087fd9

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

security/integrity/ima/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -248,18 +248,6 @@ config IMA_APPRAISE_MODSIG
248248
The modsig keyword can be used in the IMA policy to allow a hook
249249
to accept such signatures.
250250

251-
config IMA_TRUSTED_KEYRING
252-
bool "Require all keys on the .ima keyring be signed (deprecated)"
253-
depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING
254-
depends on INTEGRITY_ASYMMETRIC_KEYS
255-
select INTEGRITY_TRUSTED_KEYRING
256-
default y
257-
help
258-
This option requires that all keys added to the .ima
259-
keyring be signed by a key on the system trusted keyring.
260-
261-
This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING
262-
263251
config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY
264252
bool "Permit keys validly signed by a built-in or secondary CA cert (EXPERIMENTAL)"
265253
depends on SYSTEM_TRUSTED_KEYRING

0 commit comments

Comments
 (0)