Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

eap-ttls: Remove eap_new calls after load_settings

Browse Source 
load_settings ensures that ttls->eap is correctly initialized.  So this
code should be treated as an error condition.

We also do not support EAP chaining, so remove that logic as well
This commit is contained in:
Denis Kenzior 2018-06-20 11:57:06 -05:00
parent 2fe2ed61e1
commit a217b4f8b9
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/eap-ttls.c
View File

@ -325,23 +325,12 @@ static void eap_ttls_eap_complete(enum eap_result result, void *user_data)
{
struct eap_state *eap = user_data;
struct eap_ttls_state *ttls = eap_get_data(eap);
uint8_t last_id;
eap_save_last_id(ttls->eap, &last_id);
/* Prepare for possible chained authentication */
/* We currently have no way to configure the new instance */
eap_free(ttls->eap);
ttls->eap = eap_new(eap_ttls_eap_tx_packet,
eap_ttls_eap_complete, eap);
if (!ttls->eap) {
ttls->completed = true;
return;
}
/* Preserve the last_id as mandated by 11.3 */
eap_restore_last_id(ttls->eap, last_id);
/*
* TODO: We currently do not implement chaining per Section 11.3,
* so simply set completed to true
*/
ttls->completed = true;
}
static void eap_ttls_ready_cb(const char *peer_identity, void *user_data)
@ -381,14 +370,8 @@ static void eap_ttls_ready_cb(const char *peer_identity, void *user_data)
NULL, 0);
/* Start the EAP negotiation */
if (!ttls->eap) {
ttls->eap = eap_new(eap_ttls_eap_tx_packet,
eap_ttls_eap_complete, eap);
if (!ttls->eap) {
l_error("Could not create the TTLS inner EAP instance");
goto err;
}
}
if (!ttls->eap)
goto err;
/*
* Consume a fake Request/Identity packet so that the EAP instance