Merge branch 'exchange-collisions'
authorTobias Brunner <tobias@strongswan.org>
Fri, 17 Jun 2016 16:53:51 +0000 (18:53 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 17 Jun 2016 16:53:51 +0000 (18:53 +0200)
commit95a5806a8fb493c0e32608721f6bcda9846b651a
treec50c355b73ff9fb3679ad4beb7f9f0efd4d08e34
parent408282196453b3f610c758d6f96236ac1e9da3c7
parent5435a9a062453b460125c450c755d46c6c98684c
Merge branch 'exchange-collisions'

Improves the handling of IKEv2 exchange collisions in several corner
cases.  TEMPORARY_FAILURE and CHILD_SA_NOT_FOUND notifies that were defined
with RFC 7296 are now handled and sent as appropriate.

The behavior in these situations is tested with new unit tests.

Fixes #379, #464, #876, #1293.