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

Accept name fields in EAP-MD5 messages

Browse Source
This commit is contained in:
Martin Willi
2011-05-02 09:57:58 +02:00
parent ca0341bf85
commit 33bad71ce9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_md5/eap_md5.c
+6 -6
View File
@@ -147,12 +147,12 @@ METHOD(eap_method_t, process_peer, status_t,
this->identifier = in->get_identifier(in); this->identifier = in->get_identifier(in);
data = in->get_data(in); data = in->get_data(in);
this->challenge = chunk_clone(chunk_skip(data, 6)); if (data.len < 6 || data.ptr[5] + 6 > data.len)
if (data.len < 6 || this->challenge.len < *(data.ptr + 5))
{ {
DBG1(DBG_IKE, "received invalid EAP-MD5 message"); DBG1(DBG_IKE, "received invalid EAP-MD5 message");
return FAILED; return FAILED;
} }
this->challenge = chunk_clone(chunk_create(data.ptr + 6, data.ptr[5]));
if (hash_challenge(this, &response, this->peer, this->server) != SUCCESS) if (hash_challenge(this, &response, this->peer, this->server) != SUCCESS)
{ {
return FAILED; return FAILED;
@@ -176,7 +176,9 @@ METHOD(eap_method_t, process_server, status_t,
chunk_t response, expected; chunk_t response, expected;
chunk_t data; chunk_t data;
if (this->identifier != in->get_identifier(in)) data = in->get_data(in);
if (this->identifier != in->get_identifier(in) ||
data.len < 6 || data.ptr[5] + 6 > data.len)
{ {
DBG1(DBG_IKE, "received invalid EAP-MD5 message"); DBG1(DBG_IKE, "received invalid EAP-MD5 message");
return FAILED; return FAILED;
@@ -185,9 +187,7 @@ METHOD(eap_method_t, process_server, status_t,
{ {
return FAILED; return FAILED;
} }
data = in->get_data(in); response = chunk_create(data.ptr + 6, data.ptr[5]);
response = chunk_skip(data, 6);
if (response.len < expected.len || if (response.len < expected.len ||
!memeq(response.ptr, expected.ptr, expected.len)) !memeq(response.ptr, expected.ptr, expected.len))
{ {