Move our pseudo EAP types out of the range of valid EAP methods
[strongswan.git] / src / libstrongswan / eap / eap.c
index 11b475d..05e8da2 100644 (file)
@@ -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,30 +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);
-
-ENUM(auth_rule_names, AUTH_RULE_IDENTITY, AUTH_HELPER_SUBJECT_HASH_URL,
-       "RULE_IDENTITY",
-       "RULE_AUTH_CLASS",
-       "RULE_EAP_IDENTITY",
-       "RULE_EAP_TYPE",
-       "RULE_EAP_VENDOR",
-       "RULE_CA_CERT",
-       "RULE_IM_CERT",
-       "RULE_SUBJECT_CERT",
-       "RULE_CRL_VALIDATION",
-       "RULE_OCSP_VALIDATION",
-       "RULE_GROUP",
-       "HELPER_IM_CERT",
-       "HELPER_SUBJECT_CERT",
-       "HELPER_IM_HASH_URL",
-       "HELPER_SUBJECT_HASH_URL",
-);
+       "XP",
+       "RAD",
+       "DYN");
+ENUM_END(eap_type_short_names, EAP_DYNAMIC);
 
 /*
  * See header