diff options
author | Thomas Egerer <hakke_007@gmx.de> | 2016-01-25 06:58:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-01-25 13:45:41 -0500 |
commit | 32b6170ca59ccf07d0e394561e54b2cd9726038c (patch) | |
tree | 7045be87cdea03e6f7371f2097a7c24a03cf89f3 /net | |
parent | 27f7ed2b11d42ab6d796e96533c2076ec220affc (diff) |
ipv4+ipv6: Make INET*_ESP select CRYPTO_ECHAINIV
The ESP algorithms using CBC mode require echainiv. Hence INET*_ESP have
to select CRYPTO_ECHAINIV in order to work properly. This solves the
issues caused by a misconfiguration as described in [1].
The original approach, patching crypto/Kconfig was turned down by
Herbert Xu [2].
[1] https://lists.strongswan.org/pipermail/users/2015-December/009074.html
[2] http://marc.info/?l=linux-crypto-vger&m=145224655809562&w=2
Signed-off-by: Thomas Egerer <hakke_007@gmx.de>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/Kconfig | 1 | ||||
-rw-r--r-- | net/ipv6/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index c22920525e5d..775824720b6b 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -353,6 +353,7 @@ config INET_ESP | |||
353 | select CRYPTO_CBC | 353 | select CRYPTO_CBC |
354 | select CRYPTO_SHA1 | 354 | select CRYPTO_SHA1 |
355 | select CRYPTO_DES | 355 | select CRYPTO_DES |
356 | select CRYPTO_ECHAINIV | ||
356 | ---help--- | 357 | ---help--- |
357 | Support for IPsec ESP. | 358 | Support for IPsec ESP. |
358 | 359 | ||
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index bb7dabe2ebbf..40c897515ddc 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
@@ -69,6 +69,7 @@ config INET6_ESP | |||
69 | select CRYPTO_CBC | 69 | select CRYPTO_CBC |
70 | select CRYPTO_SHA1 | 70 | select CRYPTO_SHA1 |
71 | select CRYPTO_DES | 71 | select CRYPTO_DES |
72 | select CRYPTO_ECHAINIV | ||
72 | ---help--- | 73 | ---help--- |
73 | Support for IPsec ESP. | 74 | Support for IPsec ESP. |
74 | 75 | ||