Merge branch 'ikev1-transform-nr'
authorTobias Brunner <tobias@strongswan.org>
Fri, 6 Mar 2020 09:47:34 +0000 (10:47 +0100)
committerTobias Brunner <tobias@strongswan.org>
Fri, 6 Mar 2020 09:47:34 +0000 (10:47 +0100)
commit14a779956e3a50f91b2e5555ad42f3c9eef7b1bf
treed1dcb9123ce9582552e83e46cdd1f3e7d3e825a4
parent479c85d569fddf1b5dde28b89339ed901c2aaaa7
parente0dd36c9c7303d81c0b48a9b76642a05fd4eb0e2
Merge branch 'ikev1-transform-nr'

With these changes we return the lifetimes of the actually selected
transform back to the client, which is an issue if the peer uses
different lifetimes for different proposals.  We now also return the
correct transform and proposal IDs.

Fixes #3329.