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

added EAP PEAP and MSTLV protocols

Browse Source
This commit is contained in:
Andreas Steffen
2011-04-05 17:59:49 +02:00
parent dcfb8177b3
commit 6f05ad829a
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/eap/eap.c
+11 -4
View File
@@ -44,9 +44,12 @@ ENUM_NEXT(eap_type_names, EAP_TTLS, EAP_TTLS, EAP_SIM,
"EAP_TTLS"); "EAP_TTLS");
ENUM_NEXT(eap_type_names, EAP_AKA, EAP_AKA, EAP_TTLS, ENUM_NEXT(eap_type_names, EAP_AKA, EAP_AKA, EAP_TTLS,
"EAP_AKA"); "EAP_AKA");
ENUM_NEXT(eap_type_names, EAP_MSCHAPV2, EAP_MSCHAPV2, EAP_AKA, ENUM_NEXT(eap_type_names, EAP_PEAP, EAP_MSCHAPV2, EAP_AKA,
"EAP_PEAP",
"EAP_MSCHAPV2"); "EAP_MSCHAPV2");
ENUM_NEXT(eap_type_names, EAP_TNC, EAP_TNC, EAP_MSCHAPV2, ENUM_NEXT(eap_type_names, EAP_MSTLV, EAP_MSTLV, EAP_MSCHAPV2,
"EAP_MSTLV");
ENUM_NEXT(eap_type_names, EAP_TNC, EAP_TNC, EAP_MSTLV,
"EAP_TNC"); "EAP_TNC");
ENUM_NEXT(eap_type_names, EAP_DYNAMIC, EAP_EXPERIMENTAL, EAP_TNC, ENUM_NEXT(eap_type_names, EAP_DYNAMIC, EAP_EXPERIMENTAL, EAP_TNC,
"EAP_DYNAMIC", "EAP_DYNAMIC",
@@ -70,9 +73,12 @@ ENUM_NEXT(eap_type_short_names, EAP_TTLS, EAP_TTLS, EAP_SIM,
"TTLS"); "TTLS");
ENUM_NEXT(eap_type_short_names, EAP_AKA, EAP_AKA, EAP_TTLS, ENUM_NEXT(eap_type_short_names, EAP_AKA, EAP_AKA, EAP_TTLS,
"AKA"); "AKA");
ENUM_NEXT(eap_type_short_names, EAP_MSCHAPV2, EAP_MSCHAPV2, EAP_AKA, ENUM_NEXT(eap_type_short_names, EAP_PEAP, EAP_MSCHAPV2, EAP_AKA,
"PEAP",
"MSCHAPV2"); "MSCHAPV2");
ENUM_NEXT(eap_type_short_names, EAP_TNC, EAP_TNC, EAP_MSCHAPV2, ENUM_NEXT(eap_type_short_names, EAP_MSTLV, EAP_MSTLV, EAP_MSCHAPV2,
"MSTLV");
ENUM_NEXT(eap_type_short_names, EAP_TNC, EAP_TNC, EAP_MSTLV,
"TNC"); "TNC");
ENUM_NEXT(eap_type_short_names, EAP_DYNAMIC, EAP_EXPERIMENTAL, EAP_TNC, ENUM_NEXT(eap_type_short_names, EAP_DYNAMIC, EAP_EXPERIMENTAL, EAP_TNC,
"DYN", "DYN",
@@ -117,6 +123,7 @@ eap_type_t eap_type_from_string(char *name)
{"ttls", EAP_TTLS}, {"ttls", EAP_TTLS},
{"sim", EAP_SIM}, {"sim", EAP_SIM},
{"aka", EAP_AKA}, {"aka", EAP_AKA},
{"peap", EAP_PEAP},
{"mschapv2", EAP_MSCHAPV2}, {"mschapv2", EAP_MSCHAPV2},
{"tnc", EAP_TNC}, {"tnc", EAP_TNC},
{"radius", EAP_RADIUS}, {"radius", EAP_RADIUS},
src/libstrongswan/eap/eap.h
+13
View File
@@ -60,7 +60,9 @@ enum eap_type_t {
EAP_SIM = 18, EAP_SIM = 18,
EAP_TTLS = 21, EAP_TTLS = 21,
EAP_AKA = 23, EAP_AKA = 23,
EAP_PEAP = 25,
EAP_MSCHAPV2 = 26, EAP_MSCHAPV2 = 26,
EAP_MSTLV = 33,
EAP_TNC = 38, EAP_TNC = 38,
/** select EAP method dynamically based on i.e. EAP-Identity */ /** select EAP method dynamically based on i.e. EAP-Identity */
EAP_DYNAMIC = 252, EAP_DYNAMIC = 252,
@@ -80,6 +82,17 @@ extern enum_name_t *eap_type_names;
*/ */
extern enum_name_t *eap_type_short_names; extern enum_name_t *eap_type_short_names;
/**
* EAP packet format
*/
typedef struct __attribute__((packed)) {
u_int8_t code;
u_int8_t identifier;
u_int16_t length;
u_int8_t type;
u_int8_t data;
} eap_packet_t;
/** /**
* Lookup the EAP method type from a string. * Lookup the EAP method type from a string.
* *