Commit bde39305 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c10f66b0

crypto/Kconfig

+3 −7
Original line number Diff line number Diff line
@@ -192,16 +192,12 @@ config CRYPTO_MANAGER_EXTRA_TESTS 


config CRYPTO_NULL

	tristate "Null algorithms"

	select CRYPTO_NULL2

	select CRYPTO_ALGAPI

	select CRYPTO_SKCIPHER

	select CRYPTO_HASH

	help

	  These are 'Null' algorithms, used by IPsec, which do nothing.



config CRYPTO_NULL2

	tristate

	select CRYPTO_ALGAPI2

	select CRYPTO_SKCIPHER2

	select CRYPTO_HASH2



config CRYPTO_PCRYPT

	tristate "Parallel crypto engine"

	depends on SMP

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ obj-$(CONFIG_CRYPTO_USER) += crypto_user.o 
obj-$(CONFIG_CRYPTO_CMAC) += cmac.o

obj-$(CONFIG_CRYPTO_HMAC) += hmac.o

obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o

obj-$(CONFIG_CRYPTO_NULL2) += crypto_null.o

obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o

obj-$(CONFIG_CRYPTO_MD4) += md4.o

obj-$(CONFIG_CRYPTO_MD5) += md5.o

obj-$(CONFIG_CRYPTO_RMD160) += rmd160.o