Commit 7d4e3919 authored by Eric Biggers's avatar Eric Biggers Committed by Steffen Klassert
Browse files

esp, ah: consolidate the crypto algorithm selections 



Instead of duplicating the algorithm selections between INET_AH and
INET6_AH and between INET_ESP and INET6_ESP, create new tristates
XFRM_AH and XFRM_ESP that do the algorithm selections, and make these be
selected by the corresponding INET* options.

Suggested-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Cc: Corentin Labbe <clabbe@baylibre.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent a4902d91

net/ipv4/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -340,11 +340,7 @@ config NET_FOU_IP_TUNNELS 


config INET_AH

	tristate "IP: AH transformation"

	select XFRM_ALGO

	select CRYPTO

	select CRYPTO_HMAC

	select CRYPTO_MD5

	select CRYPTO_SHA1

	select XFRM_AH

	---help---

	  Support for IPsec AH.
@@ -352,15 +348,7 @@ config INET_AH 


config INET_ESP

	tristate "IP: ESP transformation"

	select XFRM_ALGO

	select CRYPTO

	select CRYPTO_AUTHENC

	select CRYPTO_HMAC

	select CRYPTO_MD5

	select CRYPTO_CBC

	select CRYPTO_SHA1

	select CRYPTO_DES

	select CRYPTO_ECHAINIV

	select XFRM_ESP

	---help---

	  Support for IPsec ESP.

net/ipv6/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -49,11 +49,7 @@ config IPV6_OPTIMISTIC_DAD 


config INET6_AH

	tristate "IPv6: AH transformation"

	select XFRM_ALGO

	select CRYPTO

	select CRYPTO_HMAC

	select CRYPTO_MD5

	select CRYPTO_SHA1

	select XFRM_AH

	---help---

	  Support for IPsec AH.
@@ -61,15 +57,7 @@ config INET6_AH 


config INET6_ESP

	tristate "IPv6: ESP transformation"

	select XFRM_ALGO

	select CRYPTO

	select CRYPTO_AUTHENC

	select CRYPTO_HMAC

	select CRYPTO_MD5

	select CRYPTO_CBC

	select CRYPTO_SHA1

	select CRYPTO_DES

	select CRYPTO_ECHAINIV

	select XFRM_ESP

	---help---

	  Support for IPsec ESP.

net/xfrm/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -67,6 +67,26 @@ config XFRM_STATISTICS 


	  If unsure, say N.



config XFRM_AH

	tristate

	select XFRM_ALGO

	select CRYPTO

	select CRYPTO_HMAC

	select CRYPTO_MD5

	select CRYPTO_SHA1



config XFRM_ESP

	tristate

	select XFRM_ALGO

	select CRYPTO

	select CRYPTO_AUTHENC

	select CRYPTO_HMAC

	select CRYPTO_MD5

	select CRYPTO_CBC

	select CRYPTO_SHA1

	select CRYPTO_DES

	select CRYPTO_ECHAINIV



config XFRM_IPCOMP

	tristate

	select XFRM_ALGO

CRA Git | Maintained and supported by SUSTech CRA and CCSE