From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 6 Mar 2020 09:47:34 +0000 (+0100)
Subject: Merge branch 'ikev1-transform-nr'
X-Git-Tag: 5.8.3rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14a779956e3a50f91b2e5555ad42f3c9eef7b1bf;p=thirdparty%2Fstrongswan.git

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.
---

14a779956e3a50f91b2e5555ad42f3c9eef7b1bf