Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: null - merge CRYPTO_NULL2 into CRYPTO_NULL
There is no reason to have separate CRYPTO_NULL2 and CRYPTO_NULL
options. Just merge them into CRYPTO_NULL.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
authored by
Eric Biggers
and committed by
Herbert Xu
bde39305
c10f66b0
+4
-8
+3
-7
crypto/Kconfig
+3
-7
crypto/Kconfig
···
192
192
193
193
config CRYPTO_NULL
194
194
tristate "Null algorithms"
195
-
select CRYPTO_NULL2
195
+
select CRYPTO_ALGAPI
196
+
select CRYPTO_SKCIPHER
197
+
select CRYPTO_HASH
196
198
help
197
199
These are 'Null' algorithms, used by IPsec, which do nothing.
198
-
199
-
config CRYPTO_NULL2
200
-
tristate
201
-
select CRYPTO_ALGAPI2
202
-
select CRYPTO_SKCIPHER2
203
-
select CRYPTO_HASH2
204
200
205
201
config CRYPTO_PCRYPT
206
202
tristate "Parallel crypto engine"
+1
-1
crypto/Makefile
+1
-1
crypto/Makefile
···
71
71
obj-$(CONFIG_CRYPTO_CMAC) += cmac.o
72
72
obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
73
73
obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o
74
-
obj-$(CONFIG_CRYPTO_NULL2) += crypto_null.o
74
+
obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
75
75
obj-$(CONFIG_CRYPTO_MD4) += md4.o
76
76
obj-$(CONFIG_CRYPTO_MD5) += md5.o
77
77
obj-$(CONFIG_CRYPTO_RMD160) += rmd160.o