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

Properly send empty EAP-TLS messages

Browse Source
This commit is contained in:
Martin Willi
2010-08-03 15:39:25 +02:00
parent 51313a39d1
commit 3e7e777941
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/eap_tls/eap_tls.c
+25 -22
View File
@@ -215,29 +215,32 @@ static eap_payload_t *read_buf(private_eap_tls_t *this, u_int8_t identifier)
pkt->type = EAP_TLS; pkt->type = EAP_TLS;
pkt->flags = 0; pkt->flags = 0;
start = (char*)(pkt + 1); if (this->output.len)
if (this->outpos == 0) {
{ /* first fragment */ start = (char*)(pkt + 1);
pkt->flags = EAP_TLS_LENGTH; if (this->outpos == 0)
pkt_len += 4; { /* first fragment */
start += 4; pkt->flags = EAP_TLS_LENGTH;
htoun32(pkt + 1, this->output.len); pkt_len += 4;
} start += 4;
htoun32(pkt + 1, this->output.len);
}
if (this->output.len - this->outpos > EAP_TLS_FRAGMENT_LEN) if (this->output.len - this->outpos > EAP_TLS_FRAGMENT_LEN)
{ {
pkt->flags |= EAP_TLS_MORE_FRAGS; pkt->flags |= EAP_TLS_MORE_FRAGS;
pkt_len += EAP_TLS_FRAGMENT_LEN; pkt_len += EAP_TLS_FRAGMENT_LEN;
memcpy(start, this->output.ptr + this->outpos, EAP_TLS_FRAGMENT_LEN); memcpy(start, this->output.ptr + this->outpos, EAP_TLS_FRAGMENT_LEN);
this->outpos += EAP_TLS_FRAGMENT_LEN; this->outpos += EAP_TLS_FRAGMENT_LEN;
} }
else else
{ {
pkt_len += this->output.len - this->outpos; pkt_len += this->output.len - this->outpos;
memcpy(start, this->output.ptr + this->outpos, memcpy(start, this->output.ptr + this->outpos,
this->output.len - this->outpos); this->output.len - this->outpos);
chunk_free(&this->output); chunk_free(&this->output);
this->outpos = 0; this->outpos = 0;
}
} }
htoun16(&pkt->length, pkt_len); htoun16(&pkt->length, pkt_len);
return eap_payload_create_data(chunk_create(buf, pkt_len)); return eap_payload_create_data(chunk_create(buf, pkt_len));