diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-21 12:13:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-21 12:13:53 -0500 |
| commit | 0273fd423b2fe10af96ff713273137c63a7736c0 (patch) | |
| tree | 8c77927d7714223a95a57037d05e912c5cbac5e7 /certs/system_keyring.c | |
| parent | ff872b76b3d89a09a997cc45c133e4a3ddc12f90 (diff) | |
| parent | 3cde3174eb910513d32a9ec8a9b95ea59be833df (diff) | |
| download | linux-0273fd423b2fe10af96ff713273137c63a7736c0.tar.gz linux-0273fd423b2fe10af96ff713273137c63a7736c0.tar.bz2 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/system_keyring.c')
| -rw-r--r-- | certs/system_keyring.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/certs/system_keyring.c b/certs/system_keyring.c index 05b66ce9d1c9..5042cc54fa5e 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -16,7 +16,6 @@ #include <keys/asymmetric-type.h> #include <keys/system_keyring.h> #include <crypto/pkcs7.h> -#include "common.h" static struct key *builtin_trusted_keys; #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING @@ -183,7 +182,8 @@ __init int load_module_cert(struct key *keyring) pr_notice("Loading compiled-in module X.509 certificates\n"); - return load_certificate_list(system_certificate_list, module_cert_size, keyring); + return x509_load_certificate_list(system_certificate_list, + module_cert_size, keyring); } /* @@ -204,7 +204,7 @@ static __init int load_system_certificate_list(void) size = system_certificate_list_size - module_cert_size; #endif - return load_certificate_list(p, size, builtin_trusted_keys); + return x509_load_certificate_list(p, size, builtin_trusted_keys); } late_initcall(load_system_certificate_list); |