From: Martin Willi <martin@revosec.ch>
Date: Sun, 12 Jul 2015 11:55:08 +0000 (+0200)
Subject: Merge branch 'chapoly'
X-Git-Tag: 5.3.3dr1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3232c0e64ed1bb8a865b92b0ac077863b86f9a6a;p=thirdparty%2Fstrongswan.git

Merge branch 'chapoly'

Add ChaCha20/Poly1305 AEAD support in IKEv2 and libipsec ESP through the
chapoly plugin, and in kernel ESP SAs starting with Linux 4.2.
---

3232c0e64ed1bb8a865b92b0ac077863b86f9a6a