Permalink
Browse files

pluto: add IKEv2_ENCR_CHACHA20_POLY1305 to list of ENCR

  • Loading branch information...
letoams committed Feb 19, 2017
1 parent 83f4536 commit d2fbf67ac7665006f49c87694b0724a9940b42b1
Showing with 5 additions and 3 deletions.
  1. +2 −1 include/ietf_constants.h
  2. +3 −2 lib/libswan/constants.c
@@ -850,7 +850,8 @@ enum ikev2_trans_type_encr {
IKEv2_ENCR_CAMELLIA_CCM_A = 25, /* CAMELLIA_CCM_8 RFC 5529 */
IKEv2_ENCR_CAMELLIA_CCM_B = 26, /* CAMELLIA_CCM_12 RFC 5529 */
IKEv2_ENCR_CAMELLIA_CCM_C = 27, /* CAMELLIA_CCM_16 RFC 5529 */
/* 28 - 1023 Reserved to IANA */
IKEv2_ENCR_CHACHA20_POLY1305 = 28, /* RFC7634 */
/* 29 - 1023 Reserved to IANA */
/* 1024 - 65535 Private Use */
IKEv2_ENCR_SERPENT_CBC = 65004,
IKEv2_ENCR_TWOFISH_CBC = 65005,
@@ -1894,7 +1894,8 @@ static const char *const ikev2_trans_type_encr_name[] = {
"CAMELLIA_CCM_A", /* CAMELLIA_CCM_8 RFC 5529 */
"CAMELLIA_CCM_B", /* CAMELLIA_CCM_12 RFC 5529 */
"CAMELLIA_CCM_C", /* CAMELLIA_CCM_16 RFC 5529 */
/* 28 - 1023 Unassigned */
"CHACHA20_POLY1305", /* RFC 7634 */
/* 29 - 1023 Unassigned */
/* 1024 - 65535 Private use */
};
@@ -1916,7 +1917,7 @@ static enum_names ikev2_trans_type_encr_names_private_use1 = {
enum_names ikev2_trans_type_encr_names = {
IKEv2_ENCR_DES_IV64,
IKEv2_ENCR_CAMELLIA_CCM_C,
IKEv2_ENCR_CHACHA20_POLY1305,
ARRAY_REF(ikev2_trans_type_encr_name),
NULL, /* prefix */
&ikev2_trans_type_encr_names_private_use1

0 comments on commit d2fbf67

Please sign in to comment.