Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+10
-13
+9
-12
crypto/Kconfig
+9
-12
crypto/Kconfig
···
71
71
config CRYPTO_AEAD2
72
72
tristate
73
73
select CRYPTO_ALGAPI2
74
-
select CRYPTO_NULL2
75
-
select CRYPTO_RNG2
76
74
77
75
config CRYPTO_SKCIPHER
78
76
tristate
···
80
82
config CRYPTO_SKCIPHER2
81
83
tristate
82
84
select CRYPTO_ALGAPI2
83
-
select CRYPTO_RNG2
84
85
85
86
config CRYPTO_HASH
86
87
tristate
···
831
834
832
835
This is required for IPSec ESP (XFRM_ESP).
833
836
837
+
config CRYPTO_GENIV
838
+
tristate
839
+
select CRYPTO_AEAD
840
+
select CRYPTO_NULL
841
+
select CRYPTO_MANAGER
842
+
select CRYPTO_RNG_DEFAULT
843
+
834
844
config CRYPTO_SEQIV
835
845
tristate "Sequence Number IV Generator"
836
-
select CRYPTO_AEAD
837
-
select CRYPTO_SKCIPHER
838
-
select CRYPTO_NULL
839
-
select CRYPTO_RNG_DEFAULT
840
-
select CRYPTO_MANAGER
846
+
select CRYPTO_GENIV
841
847
help
842
848
Sequence Number IV generator
843
849
···
851
851
852
852
config CRYPTO_ECHAINIV
853
853
tristate "Encrypted Chain IV Generator"
854
-
select CRYPTO_AEAD
855
-
select CRYPTO_NULL
856
-
select CRYPTO_RNG_DEFAULT
857
-
select CRYPTO_MANAGER
854
+
select CRYPTO_GENIV
858
855
help
859
856
Encrypted Chain IV generator
860
857
+1
-1
crypto/Makefile
+1
-1
crypto/Makefile