diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
| commit | 81c63b0eed39432878f78727f60a1e7499645199 (patch) | |
| tree | 82387d8fecd1c20788fd8bd784a9b0bde091fb6b /src/libstrongswan/eap | |
| parent | c5ebfc7b9c16551fe825dc1d79c3f7e2f096f6c9 (diff) | |
| download | vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.tar.gz vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.zip | |
Imported Upstream version 5.2.0
Diffstat (limited to 'src/libstrongswan/eap')
| -rw-r--r-- | src/libstrongswan/eap/eap.c | 11 | ||||
| -rw-r--r-- | src/libstrongswan/eap/eap.h | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/libstrongswan/eap/eap.c b/src/libstrongswan/eap/eap.c index c181c5de7..64b5dbe51 100644 --- a/src/libstrongswan/eap/eap.c +++ b/src/libstrongswan/eap/eap.c @@ -57,7 +57,9 @@ 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_EXPANDED, EAP_DYNAMIC, EAP_TNC, +ENUM_NEXT(eap_type_names, EAP_PT_EAP, EAP_PT_EAP, EAP_TNC, + "EAP_PT_EAP"); +ENUM_NEXT(eap_type_names, EAP_EXPANDED, EAP_DYNAMIC, EAP_PT_EAP, "EAP_EXPANDED", "EAP_EXPERIMENTAL", "EAP_RADIUS", @@ -86,7 +88,9 @@ 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_EXPANDED, EAP_DYNAMIC, EAP_TNC, +ENUM_NEXT(eap_type_short_names, EAP_PT_EAP, EAP_PT_EAP, EAP_TNC, + "PT"); +ENUM_NEXT(eap_type_short_names, EAP_EXPANDED, EAP_DYNAMIC, EAP_PT_EAP, "EXP", "XP", "RAD", @@ -114,6 +118,7 @@ eap_type_t eap_type_from_string(char *name) {"peap", EAP_PEAP}, {"mschapv2", EAP_MSCHAPV2}, {"tnc", EAP_TNC}, + {"pt", EAP_PT_EAP}, {"dynamic", EAP_DYNAMIC}, {"radius", EAP_RADIUS}, }; @@ -136,7 +141,7 @@ eap_vendor_type_t *eap_vendor_type_from_string(char *str) enumerator_t *enumerator; eap_vendor_type_t *result = NULL; eap_type_t type = 0; - u_int32_t vendor = 0; + uint32_t vendor = 0; char *part, *end; /* parse EAP method string of the form: [eap-]type[-vendor] */ diff --git a/src/libstrongswan/eap/eap.h b/src/libstrongswan/eap/eap.h index 0e144b123..08d88ba88 100644 --- a/src/libstrongswan/eap/eap.h +++ b/src/libstrongswan/eap/eap.h @@ -67,6 +67,7 @@ enum eap_type_t { EAP_MSCHAPV2 = 26, EAP_MSTLV = 33, EAP_TNC = 38, + EAP_PT_EAP = 54, EAP_EXPANDED = 254, EAP_EXPERIMENTAL = 255, /** not a method, but an implementation providing different methods */ |