mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
crypto: certs: fix FIPS selftest dependency
The selftest code is built into the x509_key_parser module, and depends on the pkcs7_message_parser module, which in turn has a dependency on the key parser, creating a dependency loop and a resulting link failure when the pkcs7 code is a loadable module: ld: crypto/asymmetric_keys/selftest.o: in function `fips_signature_selftest': crypto/asymmetric_keys/selftest.c:205: undefined reference to `pkcs7_parse_message' ld: crypto/asymmetric_keys/selftest.c:209: undefined reference to `pkcs7_supply_detached_data' ld: crypto/asymmetric_keys/selftest.c:211: undefined reference to `pkcs7_verify' ld: crypto/asymmetric_keys/selftest.c:215: undefined reference to `pkcs7_validate_trust' ld: crypto/asymmetric_keys/selftest.c:219: undefined reference to `pkcs7_free_message' Avoid this by only allowing the selftest to be enabled when either both parts are loadable modules, or both are built-in. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
This commit is contained in:
parent
ceaa837f96
commit
0f5d4a0b99
2 changed files with 2 additions and 1 deletions
|
@ -83,6 +83,6 @@ config FIPS_SIGNATURE_SELFTEST
|
||||||
for FIPS.
|
for FIPS.
|
||||||
depends on KEYS
|
depends on KEYS
|
||||||
depends on ASYMMETRIC_KEY_TYPE
|
depends on ASYMMETRIC_KEY_TYPE
|
||||||
depends on PKCS7_MESSAGE_PARSER
|
depends on PKCS7_MESSAGE_PARSER=X509_CERTIFICATE_PARSER
|
||||||
|
|
||||||
endif # ASYMMETRIC_KEY_TYPE
|
endif # ASYMMETRIC_KEY_TYPE
|
||||||
|
|
|
@ -485,3 +485,4 @@ int pkcs7_supply_detached_data(struct pkcs7_message *pkcs7,
|
||||||
pkcs7->data_len = datalen;
|
pkcs7->data_len = datalen;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(pkcs7_supply_detached_data);
|
||||||
|
|
Loading…
Reference in a new issue