提交 653ebd9c 编写于 作者: H Herbert Xu

[CRYPTO] blkcipher: Merge ablkcipher and blkcipher into one option/module

With the impending addition of the givcipher type, both blkcipher and
ablkcipher algorithms will use it to create givcipher objects.  As such
it no longer makes sense to split the system between ablkcipher and
blkcipher.  In particular, both ablkcipher.c and blkcipher.c would need
to use the givcipher type which has to reside in ablkcipher.c since it
shares much code with it.

This patch merges the two Kconfig options as well as the modules into one.
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
上级 2589469d
...@@ -24,10 +24,6 @@ config CRYPTO_ALGAPI ...@@ -24,10 +24,6 @@ config CRYPTO_ALGAPI
help help
This option provides the API for cryptographic algorithms. This option provides the API for cryptographic algorithms.
config CRYPTO_ABLKCIPHER
tristate
select CRYPTO_BLKCIPHER
config CRYPTO_AEAD config CRYPTO_AEAD
tristate tristate
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
...@@ -217,7 +213,7 @@ config CRYPTO_GCM ...@@ -217,7 +213,7 @@ config CRYPTO_GCM
config CRYPTO_CRYPTD config CRYPTO_CRYPTD
tristate "Software async crypto daemon" tristate "Software async crypto daemon"
select CRYPTO_ABLKCIPHER select CRYPTO_BLKCIPHER
select CRYPTO_MANAGER select CRYPTO_MANAGER
help help
This is a generic software asynchronous crypto daemon that This is a generic software asynchronous crypto daemon that
......
...@@ -8,9 +8,11 @@ crypto_algapi-$(CONFIG_PROC_FS) += proc.o ...@@ -8,9 +8,11 @@ crypto_algapi-$(CONFIG_PROC_FS) += proc.o
crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y) crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o
obj-$(CONFIG_CRYPTO_ABLKCIPHER) += ablkcipher.o
obj-$(CONFIG_CRYPTO_AEAD) += aead.o obj-$(CONFIG_CRYPTO_AEAD) += aead.o
obj-$(CONFIG_CRYPTO_BLKCIPHER) += blkcipher.o
crypto_blkcipher-objs := ablkcipher.o
crypto_blkcipher-objs += blkcipher.o
obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o
crypto_hash-objs := hash.o crypto_hash-objs := hash.o
obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
......
...@@ -87,7 +87,7 @@ config CRYPTO_DEV_HIFN_795X ...@@ -87,7 +87,7 @@ config CRYPTO_DEV_HIFN_795X
tristate "Driver HIFN 795x crypto accelerator chips" tristate "Driver HIFN 795x crypto accelerator chips"
select CRYPTO_DES select CRYPTO_DES
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
select CRYPTO_ABLKCIPHER select CRYPTO_BLKCIPHER
depends on PCI depends on PCI
help help
This option allows you to have support for HIFN 795x crypto adapters. This option allows you to have support for HIFN 795x crypto adapters.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册