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

send an empty EAP Ack client message if TLS was successful and handle it on the server

Browse Source
This commit is contained in:
Andreas Steffen
2011-04-15 15:02:39 +02:00
parent ad5033a67c
commit 733813c7fb
2 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_peap/eap_peap_server.c
+14 -5
View File
@@ -51,6 +51,11 @@ struct private_eap_peap_server_t {
*/
bool start_phase2_tnc;
/**
* Starts phase 2 with EAP Identity request
*/
bool start_phase2_id;
/**
* Final EAP-PEAP phase2 result
*/
@@ -332,12 +337,12 @@ METHOD(tls_application_t, build, status_t,
eap_type_t type;
u_int32_t vendor;
if (this->ph2_method == NULL && this->start_phase2 &&
lib->settings->get_bool(lib->settings,
"charon.plugins.eap-peap.phase2_piggyback", FALSE))
if (this->ph2_method == NULL && this->start_phase2 && this->start_phase2_id)
{
/* generate an EAP Identity request which will be piggybacked right
* onto the TLS Finished message thus initiating EAP-PEAP phase2
/*
* Start Phase 2 with an EAP Identity request either piggybacked right
* onto the TLS Finished payload or delayed after the reception of an
* empty EAP Acknowledge message.
*/
this->ph2_method = charon->eap->create_instance(charon->eap, EAP_IDENTITY,
0, EAP_SERVER, this->server, this->peer);
@@ -355,6 +360,8 @@ METHOD(tls_application_t, build, status_t,
this->ph2_method->initiate(this->ph2_method, &this->out);
this->start_phase2 = FALSE;
}
this->start_phase2_id = TRUE;
if (this->out)
{
@@ -415,6 +422,8 @@ eap_peap_server_t *eap_peap_server_create(identification_t *server,
.ph1_method = eap_method,
.start_phase2 = TRUE,
.start_phase2_tnc = TRUE,
.start_phase2_id = lib->settings->get_bool(lib->settings,
"charon.plugins.eap-peap.phase2_piggyback", FALSE),
.phase2_result = EAP_FAILURE,
.avp = eap_peap_avp_create(TRUE),
);