Merge branch 'chapoly'
authorMartin Willi <martin@revosec.ch>
Sun, 12 Jul 2015 11:55:08 +0000 (13:55 +0200)
committerMartin Willi <martin@revosec.ch>
Sun, 12 Jul 2015 11:55:08 +0000 (13:55 +0200)
commit3232c0e64ed1bb8a865b92b0ac077863b86f9a6a
treeae2ff7004aea73afe41391832fe73814f9d3f707
parentb01b331afe1f7215a4bae465928db5d050f8c2b9
parent396607987af970a407ae0b2397c314386d0c862a
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.