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

Revert alloc_str changes

Browse Source 
This reverts commit fdead26ffe.
This reverts commit 3e2419ebe3.
This reverts commit 17ce69b47a.
This commit is contained in:
Martin Willi
2011-04-21 13:35:31 +02:00
parent fdead26ffe
commit 5b0bcfb1fc
17 changed files with 49 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_peap/eap_peap_server.c
+8 -9
View File
@@ -62,17 +62,17 @@ struct private_eap_peap_server_t {
eap_code_t phase2_result;
/**
* Outer phase 1 EAP method
* Outer phase 1 EAP method
*/
eap_method_t *ph1_method;
/**
* Current phase 2 EAP method
* Current phase 2 EAP method
*/
eap_method_t *ph2_method;
/**
* Pending outbound EAP message
* Pending outbound EAP message
*/
eap_payload_t *out;
@@ -90,10 +90,9 @@ static status_t start_phase2_auth(private_eap_peap_server_t *this)
char *eap_type_str;
eap_type_t type;
eap_type_str = lib->settings->alloc_str(lib->settings,
eap_type_str = lib->settings->get_str(lib->settings,
"charon.plugins.eap-peap.phase2_method", "mschapv2");
type = eap_type_from_string(eap_type_str);
free(eap_type_str);
if (type == 0)
{
DBG1(DBG_IKE, "unrecognized phase2 method \"%s\"", eap_type_str);
@@ -303,8 +302,8 @@ METHOD(tls_application_t, process, status_t,
this->ph2_method->destroy(this->ph2_method);
this->ph2_method = NULL;
/* EAP-PEAP requires the sending of an inner EAP_SUCCESS message */
this->phase2_result = EAP_SUCCESS;
/* EAP-PEAP requires the sending of an inner EAP_SUCCESS message */
this->phase2_result = EAP_SUCCESS;
this->out = eap_payload_create_code(this->phase2_result, 1 +
this->ph1_method->get_identifier(this->ph1_method));
return NEED_MORE;
@@ -322,7 +321,7 @@ METHOD(tls_application_t, process, status_t,
DBG1(DBG_IKE, "%N method failed", eap_type_names, type);
}
/* EAP-PEAP requires the sending of an inner EAP_FAILURE message */
this->phase2_result = EAP_FAILURE;
this->phase2_result = EAP_FAILURE;
this->out = eap_payload_create_code(this->phase2_result, 1 +
this->ph1_method->get_identifier(this->ph1_method));
return NEED_MORE;
@@ -361,7 +360,7 @@ 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)