diff options
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.h | 4 | ||||
| -rw-r--r-- | sbin/ipsecctl/parse.y | 3 | ||||
| -rw-r--r-- | sbin/ipsecctl/pfkdump.c | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/sbin/ipsecctl/ipsecctl.h b/sbin/ipsecctl/ipsecctl.h index f95440e39c4..0df75eac73d 100644 --- a/sbin/ipsecctl/ipsecctl.h +++ b/sbin/ipsecctl/ipsecctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecctl.h,v 1.67 2012/07/10 13:58:33 lteo Exp $ */ +/* $OpenBSD: ipsecctl.h,v 1.68 2015/11/04 12:46:13 mikeb Exp $ */ /* * Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -67,7 +67,7 @@ enum { ENCXF_AES_128_CTR, ENCXF_AES_192_CTR, ENCXF_AES_256_CTR, ENCXF_AES_128_GCM, ENCXF_AES_192_GCM, ENCXF_AES_256_GCM, ENCXF_AES_128_GMAC, ENCXF_AES_192_GMAC, ENCXF_AES_256_GMAC, - ENCXF_BLOWFISH, ENCXF_CAST128, ENCXF_NULL + ENCXF_BLOWFISH, ENCXF_CAST128, ENCXF_CHACHA20_POLY1305, ENCXF_NULL }; enum { COMPXF_UNKNOWN, COMPXF_DEFLATE, COMPXF_LZS diff --git a/sbin/ipsecctl/parse.y b/sbin/ipsecctl/parse.y index cab02d25c40..46748f61d17 100644 --- a/sbin/ipsecctl/parse.y +++ b/sbin/ipsecctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.162 2015/06/03 02:24:36 millert Exp $ */ +/* $OpenBSD: parse.y,v 1.163 2015/11/04 12:46:13 mikeb Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -122,6 +122,7 @@ const struct ipsec_xf encxfs[] = { { "aes-256-gmac", ENCXF_AES_256_GMAC, 32+4, 32+4, 1, 1 }, { "blowfish", ENCXF_BLOWFISH, 5, 56, 0, 0 }, { "cast128", ENCXF_CAST128, 5, 16, 0, 0 }, + { "chacha20-poly1305", ENCXF_CHACHA20_POLY1305, 32+4, 32+4, 1, 1 }, { "null", ENCXF_NULL, 0, 0, 0, 0 }, { NULL, 0, 0, 0, 0, 0 }, }; diff --git a/sbin/ipsecctl/pfkdump.c b/sbin/ipsecctl/pfkdump.c index feead80eccc..a54d70f0779 100644 --- a/sbin/ipsecctl/pfkdump.c +++ b/sbin/ipsecctl/pfkdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkdump.c,v 1.39 2015/04/17 10:04:37 mikeb Exp $ */ +/* $OpenBSD: pfkdump.c,v 1.40 2015/11/04 12:46:13 mikeb Exp $ */ /* * Copyright (c) 2003 Markus Friedl. All rights reserved. @@ -151,6 +151,7 @@ struct idname auth_types[] = { { SADB_X_AALG_AES128GMAC, "gmac-aes-128", NULL }, { SADB_X_AALG_AES192GMAC, "gmac-aes-192", NULL }, { SADB_X_AALG_AES256GMAC, "gmac-aes-256", NULL }, + { SADB_X_AALG_CHACHA20POLY1305, "chacha20-poly1305", NULL }, { 0, NULL, NULL } }; @@ -171,6 +172,7 @@ struct idname enc_types[] = { { SADB_EALG_NULL, "null", NULL }, { SADB_X_EALG_RC4, "rc4", NULL }, { SADB_X_EALG_RC5, "rc5", NULL }, + { SADB_X_EALG_CHACHA20POLY1305, "chacha20-poly1305", NULL }, { 0, NULL, NULL } }; @@ -745,6 +747,9 @@ pfkey_print_sa(struct sadb_msg *msg, int opts) case SADB_X_EALG_CAST: xfs.encxf = &encxfs[ENCXF_CAST128]; break; + case SADB_X_EALG_CHACHA20POLY1305: + xfs.encxf = &encxfs[ENCXF_CHACHA20_POLY1305]; + break; case SADB_EALG_NULL: xfs.encxf = &encxfs[ENCXF_NULL]; break; |