Commit ba51738f authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: geniv - Split geniv out of AEAD Kconfig option 



Give geniv its own Kconfig option so that its dependencies are
distinct from that of the AEAD API code.  This also allows it
to be disabled if no IV generators (seqiv/echainiv) are enabled.

Remove the obsolete select on RNG2 by SKCIPHER2 as skcipher IV
generators disappeared long ago.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fb28fabf

crypto/Kconfig

+8 −11
Original line number Original line Diff line number Diff line
@@ -71,8 +71,6 @@ config CRYPTO_AEAD 
config CRYPTO_AEAD2

config CRYPTO_AEAD2

	tristate

	tristate

	select CRYPTO_ALGAPI2

	select CRYPTO_ALGAPI2

	select CRYPTO_NULL2

	select CRYPTO_RNG2





config CRYPTO_SKCIPHER

config CRYPTO_SKCIPHER

	tristate

	tristate
@@ -82,7 +80,6 @@ config CRYPTO_SKCIPHER 
config CRYPTO_SKCIPHER2

config CRYPTO_SKCIPHER2

	tristate

	tristate

	select CRYPTO_ALGAPI2

	select CRYPTO_ALGAPI2

	select CRYPTO_RNG2





config CRYPTO_HASH

config CRYPTO_HASH

	tristate

	tristate
@@ -834,13 +831,16 @@ config CRYPTO_GCM 




	  This is required for IPSec ESP (XFRM_ESP).

	  This is required for IPSec ESP (XFRM_ESP).





config CRYPTO_SEQIV

config CRYPTO_GENIV

	tristate "Sequence Number IV Generator"

	tristate

	select CRYPTO_AEAD

	select CRYPTO_AEAD

	select CRYPTO_SKCIPHER

	select CRYPTO_NULL

	select CRYPTO_NULL

	select CRYPTO_RNG_DEFAULT

	select CRYPTO_MANAGER

	select CRYPTO_MANAGER

	select CRYPTO_RNG_DEFAULT



config CRYPTO_SEQIV

	tristate "Sequence Number IV Generator"

	select CRYPTO_GENIV

	help

	help

	  Sequence Number IV generator

	  Sequence Number IV generator
@@ -851,10 +851,7 @@ config CRYPTO_SEQIV 




config CRYPTO_ECHAINIV

config CRYPTO_ECHAINIV

	tristate "Encrypted Chain IV Generator"

	tristate "Encrypted Chain IV Generator"

	select CRYPTO_AEAD

	select CRYPTO_GENIV

	select CRYPTO_NULL

	select CRYPTO_RNG_DEFAULT

	select CRYPTO_MANAGER

	help

	help

	  Encrypted Chain IV generator

	  Encrypted Chain IV generator

crypto/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ crypto_algapi-y := algapi.o scatterwalk.o $(crypto_algapi-y) 
obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o

obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o





obj-$(CONFIG_CRYPTO_AEAD2) += aead.o

obj-$(CONFIG_CRYPTO_AEAD2) += aead.o

obj-$(CONFIG_CRYPTO_AEAD2) += geniv.o

obj-$(CONFIG_CRYPTO_GENIV) += geniv.o





obj-$(CONFIG_CRYPTO_SKCIPHER2) += skcipher.o

obj-$(CONFIG_CRYPTO_SKCIPHER2) += skcipher.o

obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o

obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o