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

eap: Print vendor (PEN) names for vendor-specific EAP methods

Browse Source
This commit is contained in:
Tobias Brunner
2022-09-21 13:53:44 +02:00
parent f6e6fcd2f6
commit 9efd7d7e90
11 changed files with 79 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/pen/pen.c
+35
View File
@@ -50,3 +50,38 @@ ENUM_NEXT(pen_names, PEN_UNASSIGNED, PEN_RESERVED, PEN_OPENPTS,
"Unassigned",
"Reserved");
ENUM_END(pen_names, PEN_RESERVED);
ENUM_BEGIN(pen_short_names, PEN_IETF, PEN_IETF,
"IETF");
ENUM_NEXT(pen_short_names, PEN_IBM, PEN_IBM, PEN_IETF,
"IBM");
ENUM_NEXT(pen_short_names, PEN_MICROSOFT, PEN_MICROSOFT, PEN_IBM,
"MS");
ENUM_NEXT(pen_short_names, PEN_REDHAT, PEN_REDHAT, PEN_MICROSOFT,
"RH");
ENUM_NEXT(pen_short_names, PEN_PWG, PEN_PWG, PEN_REDHAT,
"PWG");
ENUM_NEXT(pen_short_names, PEN_ALTIGA, PEN_ALTIGA, PEN_PWG,
"ALT");
ENUM_NEXT(pen_short_names, PEN_OSC, PEN_OSC, PEN_ALTIGA,
"OSC");
ENUM_NEXT(pen_short_names, PEN_DEBIAN, PEN_DEBIAN, PEN_OSC,
"DEB");
ENUM_NEXT(pen_short_names, PEN_GOOGLE, PEN_GOOGLE, PEN_DEBIAN,
"GOO");
ENUM_NEXT(pen_short_names, PEN_TCG, PEN_TCG, PEN_GOOGLE,
"TCG");
ENUM_NEXT(pen_short_names, PEN_CANONICAL, PEN_CANONICAL, PEN_TCG,
"CAN");
ENUM_NEXT(pen_short_names, PEN_FEDORA, PEN_FEDORA, PEN_CANONICAL,
"FED");
ENUM_NEXT(pen_short_names, PEN_FHH, PEN_FHH, PEN_FEDORA,
"FHH");
ENUM_NEXT(pen_short_names, PEN_ITA, PEN_ITA, PEN_FHH,
"ITA");
ENUM_NEXT(pen_short_names, PEN_OPENPTS, PEN_OPENPTS, PEN_ITA,
"PTS");
ENUM_NEXT(pen_short_names, PEN_UNASSIGNED, PEN_RESERVED, PEN_OPENPTS,
"UNAS",
"RES");
ENUM_END(pen_short_names, PEN_RESERVED);
src/libstrongswan/pen/pen.h
+5
View File
@@ -107,4 +107,9 @@ static inline bool pen_type_is(pen_type_t pen_type,
*/
extern enum_name_t *pen_names;
/**
* short enum names for pen_t.
*/
extern enum_name_t *pen_short_names;
#endif /** PEN_H_ @}*/
src/libstrongswan/plugins/plugin_feature.c
+2 -2
View File
@@ -412,8 +412,8 @@ char* plugin_feature_get_string(plugin_feature_t *feature)
case FEATURE_EAP_SERVER:
case FEATURE_EAP_PEER:
if (feature->arg.eap.vendor &&
asprintf(&str, "%N:%d-%d", plugin_feature_names, feature->type,
feature->arg.eap.type, feature->arg.eap.vendor) > 0)
asprintf(&str, "%N:%d-%N", plugin_feature_names, feature->type,
feature->arg.eap.type, pen_names, feature->arg.eap.vendor) > 0)
{
return str;
}