diff options
author | David Howells <dhowells@redhat.com> | 2022-05-19 00:48:09 +0200 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2022-06-21 17:05:06 +0200 |
commit | 60050ffe3d770dd1df5b641aa48f49d07a54bd84 (patch) | |
tree | 649187b0c81d53ea6420147e041cd614521ac9c9 /certs/Makefile | |
parent | Linux 5.19-rc2 (diff) | |
download | linux-60050ffe3d770dd1df5b641aa48f49d07a54bd84.tar.xz linux-60050ffe3d770dd1df5b641aa48f49d07a54bd84.zip |
certs: Move load_certificate_list() to be with the asymmetric keys code
Move load_certificate_list(), which loads a series of binary X.509
certificates from a blob and inserts them as keys into a keyring, to be
with the asymmetric keys code that it drives.
This makes it easier to add FIPS selftest code in which we need to load up
a private keyring for the tests to use.
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Herbert Xu <herbert@gondor.apana.org.au>
cc: keyrings@vger.kernel.org
cc: linux-crypto@vger.kernel.org
Link: https://lore.kernel.org/r/165515742145.1554877.13488098107542537203.stgit@warthog.procyon.org.uk/
Diffstat (limited to 'certs/Makefile')
-rw-r--r-- | certs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/certs/Makefile b/certs/Makefile index cb1a9da3fc58..3aac9f33ee22 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -3,8 +3,8 @@ # Makefile for the linux kernel signature checking certificates. # -obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o +obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) |