diff options
| -rw-r--r-- | mk/modules.mk | 12 | ||||
| -rw-r--r-- | target/linux/config/Config.in.crypto | 41 |
2 files changed, 31 insertions, 22 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index a47829ce9..1f3b1686c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -827,28 +827,28 @@ $(eval $(call KMOD_template,CRYPTO,crypto,\ $(MODULES_DIR)/kernel/crypto/crypto \ ,01)) -$(eval $(call KMOD_template,CRYPTO_ALGAPI,crypto-algapi,\ +$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi,\ $(MODULES_DIR)/kernel/crypto/crypto_algapi \ ,02)) -$(eval $(call KMOD_template,CRYPTO_PCOMP,crypto-pcomp,\ +$(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp,\ $(MODULES_DIR)/kernel/crypto/pcompress \ ,03)) -$(eval $(call KMOD_template,CRYPTO_AEAD,crypto-aead,\ +$(eval $(call KMOD_template,CRYPTO_AEAD2,crypto-aead,\ $(MODULES_DIR)/kernel/crypto/aead \ ,03)) -$(eval $(call KMOD_template,CRYPTO_HASH,crypto-hash,\ +$(eval $(call KMOD_template,CRYPTO_HASH2,crypto-hash,\ $(MODULES_DIR)/kernel/crypto/crypto_hash \ ,04)) -$(eval $(call KMOD_template,CRYPTO_RNG,crypto-rng,\ +$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng,\ $(MODULES_DIR)/kernel/crypto/rng \ $(MODULES_DIR)/kernel/crypto/krng \ ,06)) -$(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\ +$(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager,\ $(MODULES_DIR)/kernel/crypto/cryptomgr \ $(MODULES_DIR)/kernel/crypto/eseqiv \ $(MODULES_DIR)/kernel/crypto/chainiv \ diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 92b488086..0aac38141 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -45,15 +45,15 @@ menu "Crypto core / Block and Hash modes" config ADK_KERNEL_CRYPTO_PCOMP tristate select ADK_KERNEL_CRYPTO_PCOMP2 + select ADK_KERNEL_CRYPTO_ALGAPI config ADK_KERNEL_CRYPTO_PCOMP2 tristate + select ADK_KERNEL_CRYPTO_ALGAPI2 config ADK_KERNEL_CRYPTO_ALGAPI tristate - select ADK_KERNEL_CRYPTO select ADK_KERNEL_CRYPTO_ALGAPI2 - select ADK_KERNEL_CRYPTO_MANAGER config ADK_KERNEL_CRYPTO_ALGAPI2 tristate @@ -61,39 +61,55 @@ config ADK_KERNEL_CRYPTO_ALGAPI2 config ADK_KERNEL_CRYPTO_AEAD tristate select ADK_KERNEL_CRYPTO_AEAD2 + select ADK_KERNEL_CRYPTO_ALGAPI config ADK_KERNEL_CRYPTO_AEAD2 tristate + select ADK_KERNEL_CRYPTO_ALGAPI2 config ADK_KERNEL_CRYPTO_HASH tristate select ADK_KERNEL_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI config ADK_KERNEL_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 tristate config ADK_KERNEL_CRYPTO_BLKCIPHER tristate select ADK_KERNEL_CRYPTO_BLKCIPHER2 - select ADK_KERNEL_CRYPTO_RNG - select ADK_KERNEL_CRYPTO_WORKQUEUE + select ADK_KERNEL_CRYPTO_ALGAPI config ADK_KERNEL_CRYPTO_BLKCIPHER2 tristate + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_RNG2 + select ADK_KERNEL_CRYPTO_WORKQUEUE config ADK_KERNEL_CRYPTO_WORKQUEUE tristate +config ADK_KERNEL_CRYPTO_RNG + tristate + select ADK_KERNEL_CRYPTO_RNG2 + select ADK_KERNEL_CRYPTO_ALGAPI + +config ADK_KERNEL_CRYPTO_RNG2 + tristate + select ADK_KERNEL_CRYPTO_ALGAPI2 + + config ADK_KERNEL_CRYPTO_MANAGER tristate select ADK_KERNEL_CRYPTO_MANAGER2 config ADK_KERNEL_CRYPTO_MANAGER2 - tristate - select ADK_KERNEL_CRYPTO_AEAD - select ADK_KERNEL_CRYPTO_HASH - select ADK_KERNEL_CRYPTO_BLKCIPHER - select ADK_KERNEL_CRYPTO_PCOMP + def_tristate ADK_KERNEL_CRYPTO_MANAGER || (ADK_KERNEL_CRYPTO_MANAGER!=n && ADK_KERNEL_CRYPTO_ALGAPI=y) + select ADK_KERNEL_CRYPTO_AEAD2 + select ADK_KERNEL_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_BLKCIPHER2 + select ADK_KERNEL_CRYPTO_PCOMP2 config ADK_KERNEL_CRYPTO_AUTHENC prompt "AuthENC (IPsec)" @@ -205,13 +221,6 @@ config ADK_KERNEL_CRYPTO_XCBC help XCBC: Keyed-Hashing with encryption algorithm -config ADK_KERNEL_CRYPTO_RNG - tristate - select ADK_KERNEL_CRYPTO_RNG2 - -config ADK_KERNEL_CRYPTO_RNG2 - tristate - endmenu menu "Digest algorithms" |