From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 13 Sep 2012 13:50:52 +0000 (+0200)
Subject: Merge branch 'custom-crypto'
X-Git-Tag: 5.0.1~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d786057b4e62bb46fbc33fea6063abc9a13bc66;p=thirdparty%2Fstrongswan.git

Merge branch 'custom-crypto'

This provides plugins with an interface to register keywords for
proposals (e.g. when parsing the esp and ike options from ipsec.conf)
and the possibility to register identifiers for kernel algorithms.

It is based on patches contributed by Nanoteq Pty Ltd.
---

7d786057b4e62bb46fbc33fea6063abc9a13bc66