added EAP PEAP and MSTLV protocols

diff --git a/src/libstrongswan/eap/eap.c b/src/libstrongswan/eap/eap.c
index 770c31c4b504edf8a54e7bd07787c557e02ccccd..11b475d8f8a8e6418a4f039a368949db969cb494 100644 (file)
--- a/src/libstrongswan/eap/eap.c
+++ b/src/libstrongswan/eap/eap.c
@@ -44,9 +44,12 @@ ENUM_NEXT(eap_type_names, EAP_TTLS, EAP_TTLS, EAP_SIM,
        "EAP_TTLS");
 ENUM_NEXT(eap_type_names, EAP_AKA, EAP_AKA, EAP_TTLS,
        "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");
-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");
 ENUM_NEXT(eap_type_names, EAP_DYNAMIC, EAP_EXPERIMENTAL, EAP_TNC,
        "EAP_DYNAMIC",
@@ -70,9 +73,12 @@ ENUM_NEXT(eap_type_short_names, EAP_TTLS, EAP_TTLS, EAP_SIM,
        "TTLS");
 ENUM_NEXT(eap_type_short_names, EAP_AKA, EAP_AKA, EAP_TTLS,
        "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");
-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");
 ENUM_NEXT(eap_type_short_names, EAP_DYNAMIC, EAP_EXPERIMENTAL, EAP_TNC,
        "DYN",
@@ -117,6 +123,7 @@ eap_type_t eap_type_from_string(char *name)
                {"ttls",                EAP_TTLS},
                {"sim",                 EAP_SIM},
                {"aka",                 EAP_AKA},
+               {"peap",                EAP_PEAP},
                {"mschapv2",    EAP_MSCHAPV2},
                {"tnc",                 EAP_TNC},
                {"radius",              EAP_RADIUS},

diff --git a/src/libstrongswan/eap/eap.h b/src/libstrongswan/eap/eap.h
index 8b093de4b050518ae50d72cf76eec06977c17508..945e4bc590ec7ed414c162e7f580344ef970afa2 100644 (file)
--- a/src/libstrongswan/eap/eap.h
+++ b/src/libstrongswan/eap/eap.h
@@ -60,7 +60,9 @@ enum eap_type_t {
        EAP_SIM = 18,
        EAP_TTLS = 21,
        EAP_AKA = 23,
+       EAP_PEAP = 25,
        EAP_MSCHAPV2 = 26,
+       EAP_MSTLV = 33, 
        EAP_TNC = 38,
        /** select EAP method dynamically based on i.e. EAP-Identity */
        EAP_DYNAMIC = 252,
@@ -80,6 +82,17 @@ extern enum_name_t *eap_type_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.
  *