Move our pseudo EAP types out of the range of valid EAP methods

diff --git a/src/libstrongswan/eap/eap.c b/src/libstrongswan/eap/eap.c
index efd3ee98170e7b5c0627a52cf5fd4679f4ef7a38..05e8da2a7a713f00e1e546e60a2a99cde3d9c1d4 100644 (file)
--- a/src/libstrongswan/eap/eap.c
+++ b/src/libstrongswan/eap/eap.c
@@ -51,12 +51,12 @@ 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",
-       "EAP_RADIUS",
+ENUM_NEXT(eap_type_names, EAP_EXPANDED, EAP_DYNAMIC, EAP_TNC,
        "EAP_EXPANDED",
-       "EAP_EXPERIMENTAL");
-ENUM_END(eap_type_names, EAP_EXPERIMENTAL);
+       "EAP_EXPERIMENTAL",
+       "EAP_RADIUS",
+       "EAP_DYNAMIC");
+ENUM_END(eap_type_names, EAP_DYNAMIC);
 
 ENUM_BEGIN(eap_type_short_names, EAP_IDENTITY, EAP_GTC,
        "ID",
@@ -80,12 +80,12 @@ 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",
-       "RAD",
+ENUM_NEXT(eap_type_short_names, EAP_EXPANDED, EAP_DYNAMIC, EAP_TNC,
        "EXP",
-       "XP");
-ENUM_END(eap_type_short_names, EAP_EXPERIMENTAL);
+       "XP",
+       "RAD",
+       "DYN");
+ENUM_END(eap_type_short_names, EAP_DYNAMIC);
 
 /*
  * See header

diff --git a/src/libstrongswan/eap/eap.h b/src/libstrongswan/eap/eap.h
index 143232e4b7a57dd84447ab95efedaca5686381c5..936ae1190e0fb632e654ea68c4cf27239f5e4e74 100644 (file)
--- a/src/libstrongswan/eap/eap.h
+++ b/src/libstrongswan/eap/eap.h
@@ -64,12 +64,12 @@ enum eap_type_t {
        EAP_MSCHAPV2 = 26,
        EAP_MSTLV = 33,
        EAP_TNC = 38,
-       /** select EAP method dynamically based on i.e. EAP-Identity */
-       EAP_DYNAMIC = 252,
-       /** not a method, but an implementation providing different methods */
-       EAP_RADIUS = 253,
        EAP_EXPANDED = 254,
        EAP_EXPERIMENTAL = 255,
+       /** not a method, but an implementation providing different methods */
+       EAP_RADIUS = 256,
+       /** not a method, select actual method dynamically based on e.g. the ID */
+       EAP_DYNAMIC = 257,
 };
 
 /**