From: Martin Willi <martin@revosec.ch>
Date: Fri, 16 May 2014 14:54:04 +0000 (+0200)
Subject: Merge branch 'aead-proposal'
X-Git-Tag: 5.2.0dr5~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2145f0c212d6e804125c615978fd22f3829e8839;p=thirdparty%2Fstrongswan.git

Merge branch 'aead-proposal'

Encode default AEAD encryption algorithms to a proposal separate from non-AEAD
algorithms. RFC 4306 and 5282 where less explicit, but RFC 5996 requires
separate proposals for AEAD and non-AEAD algorithms. As responder we still
accept both encoding variants.

Fixes #573.
---

2145f0c212d6e804125c615978fd22f3829e8839