Skip to content

Commit d2fbf67

Browse files
committed
pluto: add IKEv2_ENCR_CHACHA20_POLY1305 to list of ENCR
1 parent 83f4536 commit d2fbf67

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

include/ietf_constants.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,8 @@ enum ikev2_trans_type_encr {
850850
IKEv2_ENCR_CAMELLIA_CCM_A = 25, /* CAMELLIA_CCM_8 RFC 5529 */
851851
IKEv2_ENCR_CAMELLIA_CCM_B = 26, /* CAMELLIA_CCM_12 RFC 5529 */
852852
IKEv2_ENCR_CAMELLIA_CCM_C = 27, /* CAMELLIA_CCM_16 RFC 5529 */
853-
/* 28 - 1023 Reserved to IANA */
853+
IKEv2_ENCR_CHACHA20_POLY1305 = 28, /* RFC7634 */
854+
/* 29 - 1023 Reserved to IANA */
854855
/* 1024 - 65535 Private Use */
855856
IKEv2_ENCR_SERPENT_CBC = 65004,
856857
IKEv2_ENCR_TWOFISH_CBC = 65005,

lib/libswan/constants.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,8 @@ static const char *const ikev2_trans_type_encr_name[] = {
18941894
"CAMELLIA_CCM_A", /* CAMELLIA_CCM_8 RFC 5529 */
18951895
"CAMELLIA_CCM_B", /* CAMELLIA_CCM_12 RFC 5529 */
18961896
"CAMELLIA_CCM_C", /* CAMELLIA_CCM_16 RFC 5529 */
1897-
/* 28 - 1023 Unassigned */
1897+
"CHACHA20_POLY1305", /* RFC 7634 */
1898+
/* 29 - 1023 Unassigned */
18981899
/* 1024 - 65535 Private use */
18991900
};
19001901

@@ -1916,7 +1917,7 @@ static enum_names ikev2_trans_type_encr_names_private_use1 = {
19161917

19171918
enum_names ikev2_trans_type_encr_names = {
19181919
IKEv2_ENCR_DES_IV64,
1919-
IKEv2_ENCR_CAMELLIA_CCM_C,
1920+
IKEv2_ENCR_CHACHA20_POLY1305,
19201921
ARRAY_REF(ikev2_trans_type_encr_name),
19211922
NULL, /* prefix */
19221923
&ikev2_trans_type_encr_names_private_use1

0 commit comments

Comments
 (0)