denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notify-payload: Add notify types for multiple key exchanges

Browse Source
This commit is contained in:
Tobias Brunner
2024-08-07 16:20:18 +02:00
parent aedf73f7cf
commit 041358976b
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/notify_payload.c
+12 -4
View File
@@ -61,7 +61,9 @@ ENUM_NEXT(notify_type_names, SINGLE_PAIR_REQUIRED, CHILD_SA_NOT_FOUND, AUTHENTIC
"USE_ASSIGNED_HoA", "USE_ASSIGNED_HoA",
"TEMPORARY_FAILURE", "TEMPORARY_FAILURE",
"CHILD_SA_NOT_FOUND"); "CHILD_SA_NOT_FOUND");
ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND, ENUM_NEXT(notify_type_names, STATE_NOT_FOUND, STATE_NOT_FOUND, CHILD_SA_NOT_FOUND,
"STATE_NOT_FOUND");
ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, STATE_NOT_FOUND,
"ME_CONNECT_FAILED"); "ME_CONNECT_FAILED");
ENUM_NEXT(notify_type_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED, ENUM_NEXT(notify_type_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
"MS_NOTIFY_STATUS"); "MS_NOTIFY_STATUS");
@@ -119,7 +121,9 @@ ENUM_NEXT(notify_type_names, USE_PPK, INTERMEDIATE_EXCHANGE_SUPPORTED, SIGNATURE
"PPK_IDENTITY", "PPK_IDENTITY",
"NO_PPK_AUTH", "NO_PPK_AUTH",
"INTERMEDIATE_EXCHANGE_SUPPORTED"); "INTERMEDIATE_EXCHANGE_SUPPORTED");
ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, INTERMEDIATE_EXCHANGE_SUPPORTED, ENUM_NEXT(notify_type_names, ADDITIONAL_KEY_EXCHANGE, ADDITIONAL_KEY_EXCHANGE, INTERMEDIATE_EXCHANGE_SUPPORTED,
"ADDITIONAL_KEY_EXCHANGE");
ENUM_NEXT(notify_type_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, ADDITIONAL_KEY_EXCHANGE,
"INITIAL_CONTACT"); "INITIAL_CONTACT");
ENUM_NEXT(notify_type_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1, ENUM_NEXT(notify_type_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1,
"DPD_R_U_THERE", "DPD_R_U_THERE",
@@ -176,7 +180,9 @@ ENUM_NEXT(notify_type_short_names, SINGLE_PAIR_REQUIRED, CHILD_SA_NOT_FOUND, AUT
"ASSIGNED_HoA", "ASSIGNED_HoA",
"TEMP_FAIL", "TEMP_FAIL",
"NO_CHILD_SA"); "NO_CHILD_SA");
ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND, ENUM_NEXT(notify_type_short_names, STATE_NOT_FOUND, STATE_NOT_FOUND, CHILD_SA_NOT_FOUND,
"NO_STATE");
ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, STATE_NOT_FOUND,
"ME_CONN_FAIL"); "ME_CONN_FAIL");
ENUM_NEXT(notify_type_short_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED, ENUM_NEXT(notify_type_short_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
"MS_STATUS"); "MS_STATUS");
@@ -234,7 +240,9 @@ ENUM_NEXT(notify_type_short_names, USE_PPK, INTERMEDIATE_EXCHANGE_SUPPORTED, SIG
"PPK_ID", "PPK_ID",
"NO_PPK", "NO_PPK",
"IKE_INT_SUP"); "IKE_INT_SUP");
ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, INTERMEDIATE_EXCHANGE_SUPPORTED, ENUM_NEXT(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE, ADDITIONAL_KEY_EXCHANGE, INTERMEDIATE_EXCHANGE_SUPPORTED,
"ADD_KE");
ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT_IKEV1, INITIAL_CONTACT_IKEV1, ADDITIONAL_KEY_EXCHANGE,
"INITIAL_CONTACT"); "INITIAL_CONTACT");
ENUM_NEXT(notify_type_short_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1, ENUM_NEXT(notify_type_short_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_IKEV1,
"DPD", "DPD",
src/libcharon/encoding/payloads/notify_payload.h
+11
View File
@@ -80,6 +80,9 @@ enum notify_type_t {
TEMPORARY_FAILURE = 43, TEMPORARY_FAILURE = 43,
CHILD_SA_NOT_FOUND = 44, CHILD_SA_NOT_FOUND = 44,
/* multiple key exchanges, RFC 9370 */
STATE_NOT_FOUND = 47,
/* IKE-ME, private use */ /* IKE-ME, private use */
ME_CONNECT_FAILED = 8192, ME_CONNECT_FAILED = 8192,
@@ -154,6 +157,7 @@ enum notify_type_t {
FRAGMENTATION_SUPPORTED = 16430, FRAGMENTATION_SUPPORTED = 16430,
/* Signature Hash Algorithms, RFC 7427 */ /* Signature Hash Algorithms, RFC 7427 */
SIGNATURE_HASH_ALGORITHMS = 16431, SIGNATURE_HASH_ALGORITHMS = 16431,
/* Use Postquantum Preshared Key, RFC 8784 */ /* Use Postquantum Preshared Key, RFC 8784 */
USE_PPK = 16435, USE_PPK = 16435,
/* Postquantum Preshared Key Identity, RFC 8784 */ /* Postquantum Preshared Key Identity, RFC 8784 */
@@ -162,13 +166,20 @@ enum notify_type_t {
NO_PPK_AUTH = 16437, NO_PPK_AUTH = 16437,
/* IKEv2 Intermediate Exchanges, RFC 9242 */ /* IKEv2 Intermediate Exchanges, RFC 9242 */
INTERMEDIATE_EXCHANGE_SUPPORTED = 16438, INTERMEDIATE_EXCHANGE_SUPPORTED = 16438,
/* multiple key exchanges, RFC 9370 */
ADDITIONAL_KEY_EXCHANGE = 16441,
/* IKEv1 initial contact */ /* IKEv1 initial contact */
INITIAL_CONTACT_IKEV1 = 24578, INITIAL_CONTACT_IKEV1 = 24578,
/* IKEv1 DPD */ /* IKEv1 DPD */
DPD_R_U_THERE = 36136, DPD_R_U_THERE = 36136,
DPD_R_U_THERE_ACK = 36137, DPD_R_U_THERE_ACK = 36137,
/* IKEv1 Cisco High Availability */ /* IKEv1 Cisco High Availability */
UNITY_LOAD_BALANCE = 40501, UNITY_LOAD_BALANCE = 40501,
/* BEET mode, not even a draft yet. private use */ /* BEET mode, not even a draft yet. private use */
USE_BEET_MODE = 40961, USE_BEET_MODE = 40961,
/* IKE-ME, private use */ /* IKE-ME, private use */