summaryrefslogtreecommitdiff
path: root/sbin/iked/parse.y
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2015-11-04 12:40:50 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2015-11-04 12:40:50 +0000
commita06b39dddae68e415db32f86c5cd98e1138cc11e (patch)
tree469c8101c36ba71acd6952923b30f5056618d746 /sbin/iked/parse.y
parent34171ed99a087acd5e7d7ff3aa08f5fe1ec3c79a (diff)
Support Chacha20-Poly1305 for Child SAs; ok reyk
Diffstat (limited to 'sbin/iked/parse.y')
-rw-r--r--sbin/iked/parse.y4
1 files changed, 3 insertions, 1 deletions
diff --git a/sbin/iked/parse.y b/sbin/iked/parse.y
index 5e66d6ef868..d525132ee7d 100644
--- a/sbin/iked/parse.y
+++ b/sbin/iked/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.52 2015/10/31 19:28:19 naddy Exp $ */
+/* $OpenBSD: parse.y,v 1.53 2015/11/04 12:40:49 mikeb Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -194,6 +194,8 @@ const struct ipsec_xf ipsecencxfs[] = {
{ "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 }
};