Apply Crypto API wrappers to the exported crypto symbol in CONFIG_CRYPTO_SERPENT-related crypto to convert them into pluggable interface.
Signed-off-by: Jay Wang <[email protected]> --- crypto/Makefile | 2 +- crypto/fips140/fips140-api.c | 13 +++++++++++++ crypto/serpent_generic.c | 4 ++-- include/crypto/serpent.h | 20 +++++++++++++++----- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/crypto/Makefile b/crypto/Makefile index e93edc49840a..c14713e9cc55 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -132,7 +132,7 @@ crypto-objs-$(CONFIG_CRYPTO_BLOWFISH) += blowfish_generic.o crypto-objs-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o crypto-objs-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o crypto-objs-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o -obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o +crypto-objs-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o CFLAGS_serpent_generic.o := $(call cc-option,-fsched-pressure) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 crypto-objs-$(CONFIG_CRYPTO_AES) += aes.o crypto-objs-$(CONFIG_CRYPTO_SM4) += sm4.o diff --git a/crypto/fips140/fips140-api.c b/crypto/fips140/fips140-api.c index 9ad530743d1f..475cab990549 100644 --- a/crypto/fips140/fips140-api.c +++ b/crypto/fips140/fips140-api.c @@ -683,3 +683,16 @@ DEFINE_CRYPTO_API_STUB(__twofish_setkey); DEFINE_CRYPTO_API_STUB(twofish_setkey); #endif +/* + * crypto/serpent_generic.c + */ +#if IS_BUILTIN(CONFIG_CRYPTO_SERPENT) + +#include <crypto/serpent.h> + +DEFINE_CRYPTO_API_STUB(__serpent_setkey); +DEFINE_CRYPTO_API_STUB(serpent_setkey); +DEFINE_CRYPTO_API_STUB(__serpent_encrypt); +DEFINE_CRYPTO_API_STUB(__serpent_decrypt); + +#endif diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c index b21e7606c652..27c2da015d20 100644 --- a/crypto/serpent_generic.c +++ b/crypto/serpent_generic.c @@ -599,8 +599,8 @@ static void __exit serpent_mod_fini(void) crypto_unregister_alg(&srp_alg); } -module_init(serpent_mod_init); -module_exit(serpent_mod_fini); +crypto_module_init(serpent_mod_init); +crypto_module_exit(serpent_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Serpent Cipher Algorithm"); diff --git a/include/crypto/serpent.h b/include/crypto/serpent.h index 75c7eaa20853..8985ff684aeb 100644 --- a/include/crypto/serpent.h +++ b/include/crypto/serpent.h @@ -6,6 +6,7 @@ #ifndef _CRYPTO_SERPENT_H #define _CRYPTO_SERPENT_H +#include <crypto/api.h> #include <linux/types.h> #include <linux/crypto.h> @@ -18,11 +19,20 @@ struct serpent_ctx { u32 expkey[SERPENT_EXPKEY_WORDS]; }; -int __serpent_setkey(struct serpent_ctx *ctx, const u8 *key, - unsigned int keylen); -int serpent_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_SERPENT, __serpent_setkey, int, + (struct serpent_ctx *ctx, const u8 *key, unsigned int keylen), + (ctx, key, keylen)); -void __serpent_encrypt(const void *ctx, u8 *dst, const u8 *src); -void __serpent_decrypt(const void *ctx, u8 *dst, const u8 *src); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_SERPENT, serpent_setkey, int, + (struct crypto_tfm *tfm, const u8 *key, unsigned int keylen), + (tfm, key, keylen)); + +DECLARE_CRYPTO_API(CONFIG_CRYPTO_SERPENT, __serpent_encrypt, void, + (const void *ctx, u8 *dst, const u8 *src), + (ctx, dst, src)); + +DECLARE_CRYPTO_API(CONFIG_CRYPTO_SERPENT, __serpent_decrypt, void, + (const void *ctx, u8 *dst, const u8 *src), + (ctx, dst, src)); #endif -- 2.47.3
