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

use identifiers in EAP_SUCCESS/EAP_FAILURE payloads

Browse Source
This commit is contained in:
Martin Willi
2008-02-04 11:43:10 +00:00
parent 9514d26c5c
commit 3b1692c058
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/encoding/payloads/eap_payload.c
+4 -4
View File
@@ -312,13 +312,13 @@ eap_payload_t *eap_payload_create_data(chunk_t data)
/* /*
* Described in header * Described in header
*/ */
eap_payload_t *eap_payload_create_code(eap_code_t code) eap_payload_t *eap_payload_create_code(eap_code_t code, u_int8_t identifier)
{ {
eap_payload_t *this = eap_payload_create(); eap_payload_t *this = eap_payload_create();
chunk_t data = chunk_alloca(4); chunk_t data = chunk_alloca(4);
*(data.ptr + 0) = code; *(data.ptr + 0) = code;
*(data.ptr + 1) = 0; *(data.ptr + 1) = identifier;
*(u_int16_t*)(data.ptr + 2) = htons(data.len); *(u_int16_t*)(data.ptr + 2) = htons(data.len);
this->set_data(this, data); this->set_data(this, data);
@@ -328,13 +328,13 @@ eap_payload_t *eap_payload_create_code(eap_code_t code)
/* /*
* Described in header * Described in header
*/ */
eap_payload_t *eap_payload_create_nak() eap_payload_t *eap_payload_create_nak(u_int8_t identifier)
{ {
eap_payload_t *this = eap_payload_create(); eap_payload_t *this = eap_payload_create();
chunk_t data = chunk_alloca(5); chunk_t data = chunk_alloca(5);
*(data.ptr + 0) = EAP_RESPONSE; *(data.ptr + 0) = EAP_RESPONSE;
*(data.ptr + 1) = 0; *(data.ptr + 1) = identifier;
*(u_int16_t*)(data.ptr + 2) = htons(data.len); *(u_int16_t*)(data.ptr + 2) = htons(data.len);
*(data.ptr + 4) = EAP_NAK; *(data.ptr + 4) = EAP_NAK;
src/charon/encoding/payloads/eap_payload.h
+7 -4
View File
@@ -132,19 +132,22 @@ eap_payload_t *eap_payload_create_data(chunk_t data);
* Could should be either EAP_SUCCESS/EAP_FAILURE, use * Could should be either EAP_SUCCESS/EAP_FAILURE, use
* constructor above otherwise. * constructor above otherwise.
* *
* @return eap_payload_t object * @param code EAP status code
* @param identifier EAP identifier to use in payload
* @return eap_payload_t object
* *
* @ingroup payloads * @ingroup payloads
*/ */
eap_payload_t *eap_payload_create_code(eap_code_t code); eap_payload_t *eap_payload_create_code(eap_code_t code, u_int8_t identifier);
/** /**
* @brief Creates an eap_payload_t EAP_RESPONSE containing an EAP_NAK. * @brief Creates an eap_payload_t EAP_RESPONSE containing an EAP_NAK.
* *
* @return eap_payload_t object * @param identifier EAP identifier to use in payload
* @return eap_payload_t object
* *
* @ingroup payloads * @ingroup payloads
*/ */
eap_payload_t *eap_payload_create_nak(); eap_payload_t *eap_payload_create_nak(u_int8_t identifier);
#endif /* EAP_PAYLOAD_H_ */ #endif /* EAP_PAYLOAD_H_ */
src/charon/sa/authenticators/eap_authenticator.c
+8 -7
View File
@@ -147,7 +147,7 @@ static status_t initiate(private_eap_authenticator_t *this, eap_type_t type,
{ {
DBG1(DBG_IKE, DBG1(DBG_IKE,
"client requested EAP authentication, but configuration forbids it"); "client requested EAP authentication, but configuration forbids it");
*out = eap_payload_create_code(EAP_FAILURE); *out = eap_payload_create_code(EAP_FAILURE, 0);
return FAILED; return FAILED;
} }
@@ -169,14 +169,14 @@ static status_t initiate(private_eap_authenticator_t *this, eap_type_t type,
DBG1(DBG_IKE, "configured EAP server method not supported, sending %N", DBG1(DBG_IKE, "configured EAP server method not supported, sending %N",
eap_code_names, EAP_FAILURE); eap_code_names, EAP_FAILURE);
*out = eap_payload_create_code(EAP_FAILURE); *out = eap_payload_create_code(EAP_FAILURE, 0);
return FAILED; return FAILED;
} }
if (this->method->initiate(this->method, out) != NEED_MORE) if (this->method->initiate(this->method, out) != NEED_MORE)
{ {
DBG1(DBG_IKE, "failed to initiate EAP exchange, sending %N", DBG1(DBG_IKE, "failed to initiate EAP exchange, sending %N",
eap_type_names, type, eap_code_names, EAP_FAILURE); eap_type_names, type, eap_code_names, EAP_FAILURE);
*out = eap_payload_create_code(EAP_FAILURE); *out = eap_payload_create_code(EAP_FAILURE, 0);
return FAILED; return FAILED;
} }
return NEED_MORE; return NEED_MORE;
@@ -234,7 +234,7 @@ static status_t process_peer(private_eap_authenticator_t *this,
{ {
DBG1(DBG_IKE, "EAP server requested unsupported " DBG1(DBG_IKE, "EAP server requested unsupported "
"EAP method, sending EAP_NAK"); "EAP method, sending EAP_NAK");
*out = eap_payload_create_nak(); *out = eap_payload_create_nak(in->get_identifier(in));
return NEED_MORE; return NEED_MORE;
} }
} }
@@ -303,7 +303,7 @@ static status_t process_server(private_eap_authenticator_t *this,
DBG1(DBG_IKE, "EAP method %N succeded, %sMSK established", DBG1(DBG_IKE, "EAP method %N succeded, %sMSK established",
eap_type_names, type, this->msk.ptr ? "" : "no "); eap_type_names, type, this->msk.ptr ? "" : "no ");
} }
*out = eap_payload_create_code(EAP_SUCCESS); *out = eap_payload_create_code(EAP_SUCCESS, in->get_identifier(in));
return SUCCESS; return SUCCESS;
case FAILED: case FAILED:
default: default:
@@ -319,7 +319,7 @@ static status_t process_server(private_eap_authenticator_t *this,
eap_type_names, type, eap_type_names, type,
this->ike_sa->get_other_id(this->ike_sa)); this->ike_sa->get_other_id(this->ike_sa));
} }
*out = eap_payload_create_code(EAP_FAILURE); *out = eap_payload_create_code(EAP_FAILURE, in->get_identifier(in));
return FAILED; return FAILED;
} }
} }
@@ -346,7 +346,8 @@ static status_t process(private_eap_authenticator_t *this, eap_payload_t *in,
{ {
DBG1(DBG_IKE, "received %N, sending %N", DBG1(DBG_IKE, "received %N, sending %N",
eap_code_names, code, eap_code_names, EAP_FAILURE); eap_code_names, code, eap_code_names, EAP_FAILURE);
*out = eap_payload_create_code(EAP_FAILURE); *out = eap_payload_create_code(EAP_FAILURE,
in->get_identifier(in));
return FAILED; return FAILED;
} }
} }