tree e1e5e933071cd4c06885ed37184120ad172fa80d
parent 87114b7f1489039cbc71f056f9fbb0b38425df70
author Oleksandr Tymoshenko <ovt@google.com> 1695278198 +0000
committer Oleksandr Tymoshenko <ovt@google.com> 1695877173 +0000

ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig

The removal of IMA_TRUSTED_KEYRING made IMA_LOAD_X509
and IMA_BLACKLIST_KEYRING unavailable because the latter
two depend on the former. Since IMA_TRUSTED_KEYRING was
deprecated in favor of INTEGRITY_TRUSTED_KEYRING use it
as a dependency for the two Kconfigs affected by the
deprecation.

BUG=b/301260442
TEST=presubmit
RELEASE_NOTE=None

Fixes: 5087fd9e80e5 ("ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig")
Change-Id: I9f731cec219f2f55ec07bd88fc45df046260c17f
Signed-off-by: Oleksandr Tymoshenko <ovt@google.com>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/57889
Reviewed-by: Arnav Kansal <rnv@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>