tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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: Herbert Xu <herbert@gondor.apana.org.au>
+6
-8
+1
-5
crypto/Kconfig
+1
-5
crypto/Kconfig
···
24
24
help
25
25
This option provides the API for cryptographic algorithms.
26
26
27
-
config CRYPTO_ABLKCIPHER
28
-
tristate
29
-
select CRYPTO_BLKCIPHER
30
-
31
27
config CRYPTO_AEAD
32
28
tristate
33
29
select CRYPTO_ALGAPI
···
213
217
214
218
config CRYPTO_CRYPTD
215
219
tristate "Software async crypto daemon"
216
-
select CRYPTO_ABLKCIPHER
220
+
select CRYPTO_BLKCIPHER
217
221
select CRYPTO_MANAGER
218
222
help
219
223
This is a generic software asynchronous crypto daemon that
+4
-2
crypto/Makefile
+4
-2
crypto/Makefile
···
8
8
crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
9
9
obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o
10
10
11
-
obj-$(CONFIG_CRYPTO_ABLKCIPHER) += ablkcipher.o
12
11
obj-$(CONFIG_CRYPTO_AEAD) += aead.o
13
-
obj-$(CONFIG_CRYPTO_BLKCIPHER) += blkcipher.o
12
+
13
+
crypto_blkcipher-objs := ablkcipher.o
14
+
crypto_blkcipher-objs += blkcipher.o
15
+
obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o
14
16
15
17
crypto_hash-objs := hash.o
16
18
obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
+1
-1
drivers/crypto/Kconfig
+1
-1
drivers/crypto/Kconfig