From: Vegard Nossum <[email protected]> Apply Crypto API wrappers to the exported crypto symbol in CONFIG_CRYPTO_CCM-related crypto to convert them into pluggable interface.
Signed-off-by: Vegard Nossum <[email protected]> [add ccm.o into crypto-objs-y; revise commit message] Signed-off-by: Jay Wang <[email protected]> --- crypto/Makefile | 2 +- crypto/ccm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/Makefile b/crypto/Makefile index 11bb65cf0094..9dc0d5d55eaa 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -99,7 +99,7 @@ obj-$(CONFIG_CRYPTO_XCTR) += xctr.o obj-$(CONFIG_CRYPTO_HCTR2) += hctr2.o obj-$(CONFIG_CRYPTO_ADIANTUM) += adiantum.o crypto-objs-$(CONFIG_CRYPTO_GCM) += gcm.o -obj-$(CONFIG_CRYPTO_CCM) += ccm.o +crypto-objs-$(CONFIG_CRYPTO_CCM) += ccm.o obj-$(CONFIG_CRYPTO_CHACHA20POLY1305) += chacha20poly1305.o obj-$(CONFIG_CRYPTO_AEGIS128) += aegis128.o aegis128-y := aegis128-core.o diff --git a/crypto/ccm.c b/crypto/ccm.c index 2ae929ffdef8..e76946e05b5e 100644 --- a/crypto/ccm.c +++ b/crypto/ccm.c @@ -929,8 +929,8 @@ static void __exit crypto_ccm_module_exit(void) ARRAY_SIZE(crypto_ccm_tmpls)); } -module_init(crypto_ccm_module_init); -module_exit(crypto_ccm_module_exit); +crypto_module_init(crypto_ccm_module_init); +crypto_module_exit(crypto_ccm_module_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Counter with CBC MAC"); -- 2.47.3
