diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2023-10-16 13:21:44 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2023-10-27 18:04:24 +0800 |
commit | 6a49ee67e7f14ce9a00f1514655c0b6333b91730 (patch) | |
tree | a2b6b271c43f85ad4456e9024e474b11440657fe /crypto/asymmetric_keys/selftest.c | |
parent | 6dac6980754c6e19dc1f82dbd8c0a3383e26cf98 (diff) | |
download | linux-crypto-6a49ee67e7f14ce9a00f1514655c0b6333b91730.tar.gz linux-crypto-6a49ee67e7f14ce9a00f1514655c0b6333b91730.zip |
certs: Break circular dependency when selftest is modular
The modular build fails because the self-test code depends on pkcs7
which in turn depends on x509 which contains the self-test.
Split the self-test out into its own module to break the cycle.
Fixes: 041ec6e33d48 ("certs: Add FIPS selftests")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/asymmetric_keys/selftest.c')
-rw-r--r-- | crypto/asymmetric_keys/selftest.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/crypto/asymmetric_keys/selftest.c b/crypto/asymmetric_keys/selftest.c index fa0bf7f2..c50da7ef 100644 --- a/crypto/asymmetric_keys/selftest.c +++ b/crypto/asymmetric_keys/selftest.c @@ -4,10 +4,11 @@ * Written by David Howells (dhowells@redhat.com) */ -#include <linux/kernel.h> +#include <crypto/pkcs7.h> #include <linux/cred.h> +#include <linux/kernel.h> #include <linux/key.h> -#include <crypto/pkcs7.h> +#include <linux/module.h> #include "x509_parser.h" struct certs_test { @@ -175,7 +176,7 @@ static const struct certs_test certs_tests[] __initconst = { TEST(certs_selftest_1_data, certs_selftest_1_pkcs7), }; -int __init fips_signature_selftest(void) +static int __init fips_signature_selftest(void) { struct key *keyring; int ret, i; @@ -222,3 +223,9 @@ int __init fips_signature_selftest(void) key_put(keyring); return 0; } + +late_initcall(fips_signature_selftest); + +MODULE_DESCRIPTION("X.509 self tests"); +MODULE_AUTHOR("Red Hat, Inc."); +MODULE_LICENSE("GPL"); |