Use CRYPTO_API() etc. from include/crypto/api.h in preparation for compilation as part of support for FIPS 140 standalone modules.
Generated using: ./fipsify.py --config CONFIG_PKCS7_MESSAGE_PARSER --source crypto/asymmetric_keys/pkcs7_trust.c --header include/crypto/pkcs7.h Signed-off-by: Vegard Nossum <[email protected]> --- crypto/asymmetric_keys/pkcs7_trust.c | 4 ++-- crypto/fips140-api.c | 11 +++++++++++ include/crypto/pkcs7.h | 5 +++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c index 9a87c34ed173..0c04ba146ab6 100644 --- a/crypto/asymmetric_keys/pkcs7_trust.c +++ b/crypto/asymmetric_keys/pkcs7_trust.c @@ -155,7 +155,7 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, * * May also return -ENOMEM. */ -int pkcs7_validate_trust(struct pkcs7_message *pkcs7, +int CRYPTO_API(pkcs7_validate_trust)(struct pkcs7_message *pkcs7, struct key *trust_keyring) { struct pkcs7_signed_info *sinfo; @@ -185,4 +185,4 @@ int pkcs7_validate_trust(struct pkcs7_message *pkcs7, return cached_ret; } -EXPORT_SYMBOL_GPL(pkcs7_validate_trust); +DEFINE_CRYPTO_API(pkcs7_validate_trust); diff --git a/crypto/fips140-api.c b/crypto/fips140-api.c index 36d7cd3595a9..f65b2a950ccf 100644 --- a/crypto/fips140-api.c +++ b/crypto/fips140-api.c @@ -652,3 +652,14 @@ DEFINE_CRYPTO_API_STUB(pkcs7_get_content_data); #endif +/* + * crypto/asymmetric_keys/pkcs7_trust.c + */ +#if !IS_BUILTIN(CONFIG_PKCS7_MESSAGE_PARSER) + +#include <crypto/pkcs7.h> + +DEFINE_CRYPTO_API_STUB(pkcs7_validate_trust); + +#endif + diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h index fcb744d3f436..bec3884eb242 100644 --- a/include/crypto/pkcs7.h +++ b/include/crypto/pkcs7.h @@ -33,8 +33,9 @@ DECLARE_CRYPTO_API(pkcs7_get_content_data, int, /* * pkcs7_trust.c */ -extern int pkcs7_validate_trust(struct pkcs7_message *pkcs7, - struct key *trust_keyring); +DECLARE_CRYPTO_API(pkcs7_validate_trust, int, + (struct pkcs7_message *pkcs7, struct key *trust_keyring), + (pkcs7, trust_keyring)); /* * pkcs7_verify.c -- 2.39.3
