All users of the CONFIG_CRYPTO_PUBLIC_KEYS feature should update to the new syntax making keyring selection mandatory.
Instead of just making the addition of the builtin snakeoil keys explicit for the "fit" key, also add them to the "tlv" key to use them as a testing set for TLV keys too. Signed-off-by: Jonas Rebmann <[email protected]> --- crypto/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/Makefile b/crypto/Makefile index 08b9a46e4c..076ba4f686 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -33,10 +33,12 @@ CONFIG_CRYPTO_PUBLIC_KEYS := $(foreach d,$(CONFIG_CRYPTO_PUBLIC_KEYS),"$(d)") ifdef CONFIG_CRYPTO_BUILTIN_DEVELOPMENT_KEYS ifdef CONFIG_CRYPTO_RSA -CONFIG_CRYPTO_PUBLIC_KEYS += rsa-devel:$(srctree)/crypto/fit-4096-development.crt +CONFIG_CRYPTO_PUBLIC_KEYS += keyring=fit,fit-hint=rsa-devel:$(srctree)/crypto/fit-4096-development.crt +CONFIG_CRYPTO_PUBLIC_KEYS += keyring=tlv:$(srctree)/crypto/fit-4096-development.crt endif ifdef CONFIG_CRYPTO_ECDSA -CONFIG_CRYPTO_PUBLIC_KEYS += ecdsa-devel:$(srctree)/crypto/fit-ecdsa-development.crt +CONFIG_CRYPTO_PUBLIC_KEYS += keyring=fit,fit-hint=ecdsa-devel:$(srctree)/crypto/fit-ecdsa-development.crt +CONFIG_CRYPTO_PUBLIC_KEYS += keyring=tlv:$(srctree)/crypto/fit-ecdsa-development.crt endif endif -- 2.51.0.297.gca2559c1d6
