pull request (net): ipsec 2020-06-19

[Steffen Klassert <steffen.klassert@secunet.com>]

1) Fix double ESP trailer insertion in IPsec crypto offload if
   netif_xmit_frozen_or_stopped is true. From Huy Nguyen.

2) Merge fixup for "remove output_finish indirection from
   xfrm_state_afinfo". From Stephen Rothwell.

3) Select CRYPTO_SEQIV for ESP as this is needed for GCM and several
   other encryption algorithms. Also modernize the crypto algorithm
   selections for ESP and AH, remove those that are maked as "MUST NOT"
   and add those that are marked as "MUST" be implemented in RFC 8221.
   From Eric Biggers.

Please note the merge conflict between commit:

a7f7f6248d97 ("treewide: replace '---help---' in Kconfig files with 'help'")

from Linus' tree and commits:

7d4e39195925 ("esp, ah: consolidate the crypto algorithm selections")
be01369859b8 ("esp, ah: modernize the crypto algorithm selections")

from the ipsec tree.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next (2020-06-03 16:27:18 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master

for you to fetch changes up to be01369859b8aa07346e497381bb46d377da0d8c:

  esp, ah: modernize the crypto algorithm selections (2020-06-15 06:52:16 +0200)

----------------------------------------------------------------
Eric Biggers (3):
      esp, ah: consolidate the crypto algorithm selections
      esp: select CRYPTO_SEQIV
      esp, ah: modernize the crypto algorithm selections

Huy Nguyen (1):
      xfrm: Fix double ESP trailer insertion in IPsec crypto offload.

Stephen Rothwell (1):
      xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"

 include/net/xfrm.h     |  1 +
 net/ipv4/Kconfig       | 34 ++++++++++++++++++----------------
 net/ipv6/Kconfig       | 34 ++++++++++++++++++----------------
 net/xfrm/Kconfig       | 24 ++++++++++++++++++++++++
 net/xfrm/xfrm_device.c |  4 +++-
 net/xfrm/xfrm_output.c |  4 ----
 6 files changed, 64 insertions(+), 37 deletions(-)