diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-21 19:13:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-21 19:13:53 +0200 |
| commit | 0273fd423b2fe10af96ff713273137c63a7736c0 (patch) | |
| tree | 8c77927d7714223a95a57037d05e912c5cbac5e7 /certs/Makefile | |
| parent | Merge tag 'for-5.19-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | certs: Add FIPS selftests (diff) | |
| download | linux-0273fd423b2fe10af96ff713273137c63a7736c0.tar.xz linux-0273fd423b2fe10af96ff713273137c63a7736c0.zip | |
Merge tag 'certs-20220621' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull signature checking selftest from David Howells:
"The signature checking code, as used by module signing, kexec, etc.,
is non-FIPS compliant as there is no selftest.
For a kernel to be FIPS-compliant, signature checking would have to be
tested before being used, and the box would need to panic if it's not
available (probably reasonable as simply disabling signature checking
would prevent you from loading any driver modules).
Deal with this by adding a minimal test.
This is split into two patches: the first moves load_certificate_list()
to the same place as the X.509 code to make it more accessible
internally; the second adds a selftest"
* tag 'certs-20220621' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
certs: Add FIPS selftests
certs: Move load_certificate_list() to be with the asymmetric keys code
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 a8d628fd5f7b..88a73b28d254 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),) |