colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

peap: add GTC as a recognized phase2 method (bgo #565065) (rh #451027) (lp #284211)

Browse Source
This commit is contained in:
Dan Williams
2009-07-29 14:08:54 -04:00
parent 18788a26d3
commit e5347169f6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-util/nm-setting-8021x.c
View File

@@ -947,7 +947,7 @@ static EAPMethodsTable eap_methods_table[] = {
{ "peap", need_secrets_phase2, verify_ttls }, { "peap", need_secrets_phase2, verify_ttls },
{ "ttls", need_secrets_phase2, verify_ttls }, { "ttls", need_secrets_phase2, verify_ttls },
{ "sim", need_secrets_sim, NULL }, { "sim", need_secrets_sim, NULL },
{ "gtc", NULL, NULL }, // FIXME: implement { "gtc", need_secrets_password, verify_identity },
{ "otp", NULL, NULL }, // FIXME: implement { "otp", NULL, NULL }, // FIXME: implement
{ NULL, NULL, NULL } { NULL, NULL, NULL }
}; };

5
system-settings/plugins/ifcfg-rh/reader.c
View File

@@ -1204,7 +1204,9 @@ eap_peap_reader (const char *eap_method,
if (!strlen (*iter)) if (!strlen (*iter))
continue; continue;
if (!strcmp (*iter, "MSCHAPV2") || !strcmp (*iter, "MD5")) { if ( !strcmp (*iter, "MSCHAPV2")
|| !strcmp (*iter, "MD5")
|| !strcmp (*iter, "GTC")) {
if (!eap_simple_reader (*iter, ifcfg, keys, s_8021x, TRUE, error)) if (!eap_simple_reader (*iter, ifcfg, keys, s_8021x, TRUE, error))
goto done; goto done;
} else if (!strcmp (*iter, "TLS")) { } else if (!strcmp (*iter, "TLS")) {
@@ -1217,7 +1219,6 @@ eap_peap_reader (const char *eap_method,
goto done; goto done;
} }
// FIXME: OTP & GTC too
lower = g_ascii_strdown (*iter, -1); lower = g_ascii_strdown (*iter, -1);
g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, lower, NULL); g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, lower, NULL);
g_free (lower); g_free (lower);