summaryrefslogtreecommitdiff
path: root/sbin/iked/ikev2.h
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2015-10-02 17:50:55 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2015-10-02 17:50:55 +0000
commit5221672adb921b4dd3ae45feff00712203de82a9 (patch)
treed4d303b5bd0e6dd3c8ea4b77c03c548e265c7b19 /sbin/iked/ikev2.h
parentea411543dbc094c990a198d42e3b4e38b2730e8a (diff)
RFC7634 specifies ChaCha20-Poly1305 for IKEv2 and IPsec and IANA
assigned an official ID 28 for it. This is good news, and we should really support it as well. Just add the ID for now. Discussed with mikeb@
Diffstat (limited to 'sbin/iked/ikev2.h')
-rw-r--r--sbin/iked/ikev2.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sbin/iked/ikev2.h b/sbin/iked/ikev2.h
index be111fb4bb3..210b52160f3 100644
--- a/sbin/iked/ikev2.h
+++ b/sbin/iked/ikev2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2.h,v 1.20 2015/08/21 11:59:27 reyk Exp $ */
+/* $OpenBSD: ikev2.h,v 1.21 2015/10/02 17:50:54 reyk Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -180,6 +180,7 @@ extern struct iked_constmap ikev2_xformtype_map[];
#define IKEV2_XFORMENCR_CAMELLIA_CCM_8 25 /* RFC5529 */
#define IKEV2_XFORMENCR_CAMELLIA_CCM_12 26 /* RFC5529 */
#define IKEV2_XFORMENCR_CAMELLIA_CCM_16 27 /* RFC5529 */
+#define IKEV2_XFORMENCR_CHACHA20_POLY1305 28 /* RFC7634 */
extern struct iked_constmap ikev2_xformencr_map[];
@@ -455,6 +456,7 @@ struct ikev2_auth {
#define IKEV2_AUTH_ECDSA_384 10 /* RFC4754 */
#define IKEV2_AUTH_ECDSA_512 11 /* RFC4754 */
#define IKEV2_AUTH_GSPM 12 /* RFC6467 */
+#define IKEV2_AUTH_NULL 13 /* RFC7619 */
#define IKEV2_AUTH_SIG 14 /* RFC7427 */
extern struct iked_constmap ikev2_auth_map[];