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

eap-peap: Add reset_state method

Browse Source
This commit is contained in:
Denis Kenzior 2018-06-07 19:43:03 -05:00
parent 6e242acddb
commit 1f3b120467
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/eap-peap.c
View File

@ -136,10 +136,8 @@ static void databuf_free(struct databuf *databuf)
l_free(databuf); l_free(databuf);
} }
static void eap_peap_free_rx_buffer(struct eap_state *eap) static void eap_peap_free_rx_buffer(struct eap_peap_state *peap)
{ {
struct eap_peap_state *peap = eap_get_data(eap);
if (!peap->rx_pdu_buf) if (!peap->rx_pdu_buf)
return; return;
@ -149,19 +147,20 @@ static void eap_peap_free_rx_buffer(struct eap_state *eap)
peap->rx_pdu_buf_offset = 0; peap->rx_pdu_buf_offset = 0;
} }
static void eap_peap_free(struct eap_state *eap) static void __eap_peap_reset_state(struct eap_peap_state *peap)
{ {
struct eap_peap_state *peap = eap_get_data(eap); peap->version = PEAP_VERSION_NOT_NEGOTIATED;
peap->completed = false;
peap->phase2_failed = false;
peap->expecting_frag_ack = false;
if (peap->tunnel) { if (peap->tunnel) {
l_tls_free(peap->tunnel); l_tls_free(peap->tunnel);
peap->tunnel = NULL; peap->tunnel = NULL;
} }
if (peap->phase2_eap) { peap->tx_frag_offset = 0;
eap_free(peap->phase2_eap); peap->tx_frag_last_len = 0;
peap->phase2_eap = NULL;
}
if (peap->tx_pdu_buf) { if (peap->tx_pdu_buf) {
databuf_free(peap->tx_pdu_buf); databuf_free(peap->tx_pdu_buf);
@ -173,16 +172,43 @@ static void eap_peap_free(struct eap_state *eap)
peap->plain_buf = NULL; peap->plain_buf = NULL;
} }
eap_peap_free_rx_buffer(eap); eap_peap_free_rx_buffer(peap);
}
static bool eap_peap_reset_state(struct eap_state *eap)
{
struct eap_peap_state *peap = eap_get_data(eap);
if (!peap->phase2_eap)
return false;
if (!eap_reset(peap->phase2_eap))
return false;
__eap_peap_reset_state(peap);
return true;
}
static void eap_peap_free(struct eap_state *eap)
{
struct eap_peap_state *peap = eap_get_data(eap);
__eap_peap_reset_state(peap);
eap_set_data(eap, NULL); eap_set_data(eap, NULL);
if (peap->phase2_eap) {
eap_free(peap->phase2_eap);
peap->phase2_eap = NULL;
}
l_free(peap->ca_cert); l_free(peap->ca_cert);
l_free(peap->client_cert); l_free(peap->client_cert);
l_free(peap->client_key); l_free(peap->client_key);
if (peap->passphrase)
if (peap->passphrase) {
memset(peap->passphrase, 0, strlen(peap->passphrase)); memset(peap->passphrase, 0, strlen(peap->passphrase));
l_free(peap->passphrase); l_free(peap->passphrase);
}
l_free(peap); l_free(peap);
} }
@ -751,7 +777,7 @@ static void eap_peap_handle_request(struct eap_state *eap,
eap_peap_handle_payload(eap, pkt, len); eap_peap_handle_payload(eap, pkt, len);
eap_peap_free_rx_buffer(eap); eap_peap_free_rx_buffer(peap);
send_response: send_response:
if (!peap->tx_pdu_buf) { if (!peap->tx_pdu_buf) {
@ -994,6 +1020,7 @@ static struct eap_method eap_peap = {
.check_settings = eap_peap_check_settings, .check_settings = eap_peap_check_settings,
.load_settings = eap_peap_load_settings, .load_settings = eap_peap_load_settings,
.free = eap_peap_free, .free = eap_peap_free,
.reset_state = eap_peap_reset_state,
}; };
static int eap_peap_init(void) static int eap_peap_init(void)