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: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 44292989d0703c7890b7a95af5efee2a26487e7c..8b8bb97d1d77f157893da28627725f1e09dad029 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -71,8 +71,6 @@ config CRYPTO_AEAD
 config CRYPTO_AEAD2
        tristate
        select CRYPTO_ALGAPI2
-       select CRYPTO_NULL2
-       select CRYPTO_RNG2
 
 config CRYPTO_SKCIPHER
        tristate
@@ -82,7 +80,6 @@ config CRYPTO_SKCIPHER
 config CRYPTO_SKCIPHER2
        tristate
        select CRYPTO_ALGAPI2
-       select CRYPTO_RNG2
 
 config CRYPTO_HASH
        tristate
@@ -834,13 +831,16 @@ config CRYPTO_GCM
 
          This is required for IPSec ESP (XFRM_ESP).
 
-config CRYPTO_SEQIV
-       tristate "Sequence Number IV Generator"
+config CRYPTO_GENIV
+       tristate
        select CRYPTO_AEAD
-       select CRYPTO_SKCIPHER
        select CRYPTO_NULL
-       select CRYPTO_RNG_DEFAULT
        select CRYPTO_MANAGER
+       select CRYPTO_RNG_DEFAULT
+
+config CRYPTO_SEQIV
+       tristate "Sequence Number IV Generator"
+       select CRYPTO_GENIV
        help
          Sequence Number IV generator
 
@@ -851,10 +851,7 @@ config CRYPTO_SEQIV
 
 config CRYPTO_ECHAINIV
        tristate "Encrypted Chain IV Generator"
-       select CRYPTO_AEAD
-       select CRYPTO_NULL
-       select CRYPTO_RNG_DEFAULT
-       select CRYPTO_MANAGER
+       select CRYPTO_GENIV
        help
          Encrypted Chain IV generator
 

diff --git a/crypto/Makefile b/crypto/Makefile
index 45dae478af2b5c3f1c1c2d214cadc02dfb6b44a3..155ab671a1b4110924f95aa541b1e93ede715b37 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -14,7 +14,7 @@ crypto_algapi-y := algapi.o scatterwalk.o $(crypto_algapi-y)
 obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.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_SEQIV) += seqiv.o