Commit 653ebd9c authored by Herbert Xu's avatar Herbert Xu
Browse files

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2589469d

crypto/Kconfig

+1 −5
Original line number Original line Diff line number Diff line
@@ -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 




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

crypto/Makefile

+4 −2
Original line number Original line Diff line number Diff line
@@ -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

drivers/crypto/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE