diff options
Diffstat (limited to 'backport')
| -rw-r--r-- | backport/compat/Kconfig | 11 | ||||
| -rw-r--r-- | backport/compat/Makefile | 1 | ||||
| -rw-r--r-- | backport/compat/backports.h | 10 | ||||
| -rw-r--r-- | backport/compat/main.c | 9 |
4 files changed, 1 insertions, 30 deletions
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig index 542cf0cc..492efbfc 100644 --- a/backport/compat/Kconfig +++ b/backport/compat/Kconfig @@ -102,17 +102,6 @@ config BPAUTO_USERSEL_BUILD_ALL It's only really useful for compat testing, so you probably shouldn't enable it. -config BPAUTO_CRYPTO_CCM - depends on CRYPTO_AEAD - depends on CRYPTO_CTR - bool - -config BPAUTO_BUILD_CRYPTO_CCM - bool - default n if CRYPTO_CCM - default y if BPAUTO_CRYPTO_CCM - #c-file crypto/ccm.c - config BPAUTO_CRYPTO_SKCIPHER tristate depends on KERNEL_4_3 diff --git a/backport/compat/Makefile b/backport/compat/Makefile index ead22a00..69cfd514 100644 --- a/backport/compat/Makefile +++ b/backport/compat/Makefile @@ -37,7 +37,6 @@ compat-$(CPTCFG_KERNEL_4_7) += backport-4.7.o compat-$(CPTCFG_KERNEL_4_8) += backport-4.8.o compat-$(CPTCFG_KERNEL_4_10) += backport-4.10.o -compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/verify.o diff --git a/backport/compat/backports.h b/backport/compat/backports.h index ccc8972b..53848888 100644 --- a/backport/compat/backports.h +++ b/backport/compat/backports.h @@ -3,16 +3,6 @@ #include <linux/version.h> -#ifdef CPTCFG_BPAUTO_BUILD_CRYPTO_CCM -int crypto_ccm_module_init(void); -void crypto_ccm_module_exit(void); -#else -static inline int crypto_ccm_module_init(void) -{ return 0; } -static inline void crypto_ccm_module_exit(void) -{} -#endif - #ifdef CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP int devcoredump_init(void); void devcoredump_exit(void); diff --git a/backport/compat/main.c b/backport/compat/main.c index 5d45e3da..0bf04201 100644 --- a/backport/compat/main.c +++ b/backport/compat/main.c @@ -53,16 +53,10 @@ EXPORT_SYMBOL_GPL(backport_dependency_symbol); static int __init backport_init(void) { - int ret = crypto_ccm_module_init(); + int ret = devcoredump_init(); if (ret) return ret; - ret = devcoredump_init(); - if (ret) { - crypto_ccm_module_exit(); - return ret; - } - printk(KERN_INFO "Loading modules backported from " CPTCFG_KERNEL_NAME #ifndef BACKPORTS_GIT_TRACKED " version " CPTCFG_KERNEL_VERSION @@ -86,7 +80,6 @@ subsys_initcall(backport_init); static void __exit backport_exit(void) { - crypto_ccm_module_exit(); devcoredump_exit(); } module_exit(backport_exit); |