On Mon, Oct 26, 2015 at 06:35:23PM +0100, Mike Belopuhov wrote:
> OK?
>
You missed the manpage bits in CRYPTO TRANSFORMS.
Otherwise OK.
> ---
> sbin/iked/parse.y | 2 ++
> sbin/iked/pfkey.c | 1 +
> 2 files changed, 3 insertions(+)
>
> diff --git sbin/iked/parse.y sbin/iked/parse.y
> index 14ff9ef..94489f9 100644
> --- sbin/iked/parse.y
> +++ sbin/iked/parse.y
> @@ -192,10 +192,12 @@ const struct ipsec_xf ipsecencxfs[] = {
> { "aes-128-gmac", IKEV2_XFORMENCR_NULL_AES_GMAC, 16, 16, 4, 1 },
> { "aes-192-gmac", IKEV2_XFORMENCR_NULL_AES_GMAC, 24, 24, 4, 1 },
> { "aes-256-gmac", IKEV2_XFORMENCR_NULL_AES_GMAC, 32, 32, 4, 1 },
> { "blowfish", IKEV2_XFORMENCR_BLOWFISH, 20, 20 },
> { "cast", IKEV2_XFORMENCR_CAST, 16, 16 },
> + { "chacha20-poly1305", IKEV2_XFORMENCR_CHACHA20_POLY1305,
> + 32, 32, 4, 1 },
> { "null", IKEV2_XFORMENCR_NULL, 0, 0 },
> { NULL }
> };
>
> const struct ipsec_xf groupxfs[] = {
> diff --git sbin/iked/pfkey.c sbin/iked/pfkey.c
> index b1a48b3..530c84e 100644
> --- sbin/iked/pfkey.c
> +++ sbin/iked/pfkey.c
> @@ -82,10 +82,11 @@ static const struct pfkey_constmap pfkey_encr[] = {
> { SADB_EALG_NULL, IKEV2_XFORMENCR_NULL },
> { SADB_X_EALG_AES, IKEV2_XFORMENCR_AES_CBC },
> { SADB_X_EALG_AESCTR, IKEV2_XFORMENCR_AES_CTR },
> { SADB_X_EALG_AESGCM16, IKEV2_XFORMENCR_AES_GCM_16 },
> { SADB_X_EALG_AESGMAC, IKEV2_XFORMENCR_NULL_AES_GMAC },
> + { SADB_X_EALG_CHACHA20POLY1305, IKEV2_XFORMENCR_CHACHA20_POLY1305 },
> { 0 }
> };
>
> static const struct pfkey_constmap pfkey_integr[] = {
> { SADB_AALG_MD5HMAC, IKEV2_XFORMAUTH_HMAC_MD5_96 },
> --
> 2.6.2
>
--
