sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

wip: ikev2: Change multi-KE codepoints for testing

Browse Source
This commit is contained in:
Andreas Steffen 2019-11-08 13:04:08 +01:00
parent a7efdcbad4
commit 09d7c93754
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcharon/encoding/payloads/ike_header.c
View File

@ -128,9 +128,11 @@ ENUM_NEXT(exchange_type_names, QUICK_MODE, IKE_SESSION_RESUME, TRANSACTION,
"CREATE_CHILD_SA",
"INFORMATIONAL",
"IKE_SESSION_RESUME");
ENUM_NEXT(exchange_type_names, IKE_INTERMEDIATE, IKE_FOLLOWUP_KE,
ENUM_NEXT(exchange_type_names, IKE_INTERMEDIATE, IKE_INTERMEDIATE,
IKE_SESSION_RESUME,
"IKE_INTERMEDIATE",
"IKE_INTERMEDIATE");
ENUM_NEXT(exchange_type_names, IKE_FOLLOWUP_KE, IKE_FOLLOWUP_KE,
IKE_INTERMEDIATE,
"IKE_FOLLOWUP_KE");
#ifdef ME
ENUM_NEXT(exchange_type_names, ME_CONNECT, ME_CONNECT, IKE_FOLLOWUP_KE,

2
src/libcharon/encoding/payloads/ike_header.h
View File

@ -125,7 +125,7 @@ enum exchange_type_t{
IKE_INTERMEDIATE = 43,
/* IKE_FOLLOWUP_KE (draft-ietf-ipsecme-ikev2-multiple-ke) */
IKE_FOLLOWUP_KE = 44,
IKE_FOLLOWUP_KE = 138,
#ifdef ME
/**

16
src/libcharon/encoding/payloads/notify_payload.c
View File

@ -127,8 +127,7 @@ ENUM_NEXT(notify_type_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_I
"DPD_R_U_THERE_ACK");
ENUM_NEXT(notify_type_names, UNITY_LOAD_BALANCE, UNITY_LOAD_BALANCE, DPD_R_U_THERE_ACK,
"UNITY_LOAD_BALANCE");
ENUM_NEXT(notify_type_names, ADDITIONAL_KEY_EXCHANGE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
"ADDITIONAL_KEY_EXCHANGE",
ENUM_NEXT(notify_type_names, USE_BEET_MODE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
"USE_BEET_MODE");
ENUM_NEXT(notify_type_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
"ME_MEDIATION",
@ -139,7 +138,10 @@ ENUM_NEXT(notify_type_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
"ME_CONNECTAUTH",
"ME_RESPONSE",
"RADIUS_ATTRIBUTE");
ENUM_END(notify_type_names, RADIUS_ATTRIBUTE);
ENUM_NEXT(notify_type_names, ADDITIONAL_KEY_EXCHANGE,
ADDITIONAL_KEY_EXCHANGE, RADIUS_ATTRIBUTE,
"ADDITIONAL_KEY_EXCHANGE");
ENUM_END(notify_type_names, ADDITIONAL_KEY_EXCHANGE);
ENUM_BEGIN(notify_type_short_names, UNSUPPORTED_CRITICAL_PAYLOAD, UNSUPPORTED_CRITICAL_PAYLOAD,
@ -244,8 +246,7 @@ ENUM_NEXT(notify_type_short_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CON
"DPD_ACK");
ENUM_NEXT(notify_type_short_names, UNITY_LOAD_BALANCE, UNITY_LOAD_BALANCE, DPD_R_U_THERE_ACK,
"UNITY_LB");
ENUM_NEXT(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
"ADD_KE",
ENUM_NEXT(notify_type_short_names, USE_BEET_MODE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
"BEET_MODE");
ENUM_NEXT(notify_type_short_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
"ME_MED",
@ -256,7 +257,10 @@ ENUM_NEXT(notify_type_short_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE
"ME_CAUTH",
"ME_R",
"RADIUS");
ENUM_END(notify_type_short_names, RADIUS_ATTRIBUTE);
ENUM_NEXT(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE,
ADDITIONAL_KEY_EXCHANGE, RADIUS_ATTRIBUTE,
"ADD_KE");
ENUM_END(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE);
typedef struct private_notify_payload_t private_notify_payload_t;

4
src/libcharon/encoding/payloads/notify_payload.h
View File

@ -170,8 +170,6 @@ enum notify_type_t {
DPD_R_U_THERE_ACK = 36137,
/* IKEv1 Cisco High Availability */
UNITY_LOAD_BALANCE = 40501,
/* draft-ietf-ipsecme-ikev2-multiple-ke */
ADDITIONAL_KEY_EXCHANGE = 40960,
/* BEET mode, not even a draft yet. private use */
USE_BEET_MODE = 40961,
/* IKE-ME, private use */
@ -184,6 +182,8 @@ enum notify_type_t {
ME_RESPONSE = 40968,
/* RADIUS attribute received/to send to a AAA backend */
RADIUS_ATTRIBUTE = 40969,
/* draft-ietf-ipsecme-ikev2-multiple-ke */
ADDITIONAL_KEY_EXCHANGE = 50205,
};
/**