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/libcharon/plugins/eap_dynamic/eap_dynamic.c
+6 -6
View File
@@ -93,8 +93,8 @@ static eap_method_t *load_method(private_eap_dynamic_t *this,
{
if (vendor)
{
DBG1(DBG_IKE, "loading vendor specific EAP method %d-%d failed",
type, vendor);
DBG1(DBG_IKE, "loading vendor specific EAP method %d-%N failed",
type, pen_names, vendor);
}
else
{
@@ -135,9 +135,9 @@ static void select_method(private_eap_dynamic_t *this)
{
if (entry->vendor)
{
DBG2(DBG_IKE, "proposed vendor specific EAP method %d-%d "
DBG2(DBG_IKE, "proposed vendor specific EAP method %d-%N "
"not supported by %s, skipped", entry->type,
entry->vendor, who);
pen_names, entry->vendor, who);
}
else
{
@@ -157,8 +157,8 @@ static void select_method(private_eap_dynamic_t *this)
}
if (entry->vendor)
{
DBG1(DBG_IKE, "vendor specific EAP method %d-%d selected",
entry->type, entry->vendor);
DBG1(DBG_IKE, "vendor specific EAP method %d-%N selected",
entry->type, pen_names, entry->vendor);
}
else
{
src/libcharon/plugins/eap_peap/eap_peap_peer.c
+4 -4
View File
@@ -137,8 +137,8 @@ METHOD(tls_application_t, process, status_t,
{
if (received_vendor)
{
DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d "
"(id 0x%02X)", received_type, received_vendor,
DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%N "
"(id 0x%02X)", received_type, pen_names, received_vendor,
in->get_identifier(in));
}
else
@@ -175,8 +175,8 @@ METHOD(tls_application_t, process, status_t,
default:
if (vendor)
{
DBG1(DBG_IKE, "vendor specific EAP method %d-%d failed",
type, vendor);
DBG1(DBG_IKE, "vendor specific EAP method %d-%N failed",
type, pen_names, vendor);
}
else
{
src/libcharon/plugins/eap_peap/eap_peap_server.c
+2 -2
View File
@@ -317,8 +317,8 @@ METHOD(tls_application_t, process, status_t,
default:
if (vendor)
{
DBG1(DBG_IKE, "vendor specific EAP method %d-%d failed",
type, vendor);
DBG1(DBG_IKE, "vendor specific EAP method %d-%N failed",
type, pen_names, vendor);
}
else
{
src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
+4 -4
View File
@@ -185,8 +185,8 @@ METHOD(tls_application_t, process, status_t,
{
if (received_vendor)
{
DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d "
"(id 0x%02X)", received_type, received_vendor,
DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%N "
"(id 0x%02X)", received_type, pen_names, received_vendor,
in->get_identifier(in));
}
else
@@ -224,8 +224,8 @@ METHOD(tls_application_t, process, status_t,
default:
if (vendor)
{
DBG1(DBG_IKE, "vendor specific EAP method %d-%d failed",
type, vendor);
DBG1(DBG_IKE, "vendor specific EAP method %d-%N failed",
type, pen_names, vendor);
}
else
{
src/libcharon/plugins/eap_ttls/eap_ttls_server.c
+2 -2
View File
@@ -292,8 +292,8 @@ METHOD(tls_application_t, process, status_t,
default:
if (vendor)
{
DBG1(DBG_IKE, "vendor specific EAP method %d-%d failed",
type, vendor);
DBG1(DBG_IKE, "vendor specific EAP method %d-%N failed",
type, pen_names, vendor);
}
else
{
src/libcharon/plugins/vici/vici_config.c
+1 -1
View File
@@ -370,7 +370,7 @@ static void log_auth(auth_cfg_t *auth)
DBG2(DBG_CFG, " eap-type = %N", eap_type_names, v.u);
break;
case AUTH_RULE_EAP_VENDOR:
DBG2(DBG_CFG, " eap-vendor = %u", v.u);
DBG2(DBG_CFG, " eap-vendor = %N", pen_names, v.u);
break;
case AUTH_RULE_XAUTH_BACKEND:
DBG2(DBG_CFG, " xauth = %s", v.str);