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

added GSPM IKEv2 payload

Browse Source
This commit is contained in:
Andreas Steffen
2012-04-03 12:21:39 +02:00
parent d1391b8fdb
commit f54c4ed8d6
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/payload.c
+15 -8
View File
@@ -39,7 +39,8 @@
ENUM_BEGIN(payload_type_names, NO_PAYLOAD, NO_PAYLOAD, ENUM_BEGIN(payload_type_names, NO_PAYLOAD, NO_PAYLOAD,
"NO_PAYLOAD"); "NO_PAYLOAD");
ENUM_NEXT(payload_type_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICATION, NO_PAYLOAD, ENUM_NEXT(payload_type_names, SECURITY_ASSOCIATION,
GENERIC_SECURE_PASSWORD_METHOD, NO_PAYLOAD,
"SECURITY_ASSOCIATION", "SECURITY_ASSOCIATION",
"KEY_EXCHANGE", "KEY_EXCHANGE",
"ID_INITIATOR", "ID_INITIATOR",
@@ -55,9 +56,10 @@ ENUM_NEXT(payload_type_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICATION, N
"TRAFFIC_SELECTOR_RESPONDER", "TRAFFIC_SELECTOR_RESPONDER",
"ENCRYPTED", "ENCRYPTED",
"CONFIGURATION", "CONFIGURATION",
"EXTENSIBLE_AUTHENTICATION"); "EXTENSIBLE_AUTHENTICATION",
"GENERIC_SECURE_PASSWORD_METHOD");
#ifdef ME #ifdef ME
ENUM_NEXT(payload_type_names, ID_PEER, ID_PEER, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_names, ID_PEER, ID_PEER, GENERIC_SECURE_PASSWORD_METHOD,
"ID_PEER"); "ID_PEER");
ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER, ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER,
"HEADER", "HEADER",
@@ -67,7 +69,8 @@ ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER,
"TRAFFIC_SELECTOR_SUBSTRUCTURE", "TRAFFIC_SELECTOR_SUBSTRUCTURE",
"CONFIGURATION_ATTRIBUTE"); "CONFIGURATION_ATTRIBUTE");
#else #else
ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE,
GENERIC_SECURE_PASSWORD_METHOD,
"HEADER", "HEADER",
"PROPOSAL_SUBSTRUCTURE", "PROPOSAL_SUBSTRUCTURE",
"TRANSFORM_SUBSTRUCTURE", "TRANSFORM_SUBSTRUCTURE",
@@ -80,7 +83,8 @@ ENUM_END(payload_type_names, CONFIGURATION_ATTRIBUTE);
/* short forms of payload names */ /* short forms of payload names */
ENUM_BEGIN(payload_type_short_names, NO_PAYLOAD, NO_PAYLOAD, ENUM_BEGIN(payload_type_short_names, NO_PAYLOAD, NO_PAYLOAD,
"--"); "--");
ENUM_NEXT(payload_type_short_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICATION, NO_PAYLOAD, ENUM_NEXT(payload_type_short_names, SECURITY_ASSOCIATION,
GENERIC_SECURE_PASSWORD_METHOD, NO_PAYLOAD,
"SA", "SA",
"KE", "KE",
"IDi", "IDi",
@@ -96,9 +100,11 @@ ENUM_NEXT(payload_type_short_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICAT
"TSr", "TSr",
"E", "E",
"CP", "CP",
"EAP"); "EAP",
"GSPM");
#ifdef ME #ifdef ME
ENUM_NEXT(payload_type_short_names, ID_PEER, ID_PEER, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_short_names, ID_PEER, ID_PEER,
GENERIC_SECURE_PASSWORD_METHOD,
"IDp"); "IDp");
ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER, ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER,
"HDR", "HDR",
@@ -108,7 +114,8 @@ ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER,
"TSSUB", "TSSUB",
"CPATTR"); "CPATTR");
#else #else
ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE,
GENERIC_SECURE_PASSWORD_METHOD,
"HDR", "HDR",
"PROP", "PROP",
"TRANS", "TRANS",
src/libcharon/encoding/payloads/payload.h
+5
View File
@@ -123,6 +123,11 @@ enum payload_type_t{
*/ */
EXTENSIBLE_AUTHENTICATION = 48, EXTENSIBLE_AUTHENTICATION = 48,
/**
* Generic Secure Password Method (GSPM).
*/
GENERIC_SECURE_PASSWORD_METHOD = 49,
#ifdef ME #ifdef ME
/** /**
* Identification payload for peers has a value from * Identification payload for peers has a value from