sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-05 00:00:45 -04:00
Code Issues Projects Releases Wiki Activity

generator: Make pointer to length field optional

Browse Source 
Only useful if we generate an IKE header.
This commit is contained in:
Tobias Brunner 2019-08-20 14:53:16 +02:00 committed by Andreas Steffen
parent 92e709397f
commit 68ef0e919b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcharon/encoding/generator.c
View File

@ -431,7 +431,10 @@ METHOD(generator_t, get_chunk, chunk_t,
{ {
chunk_t data; chunk_t data;
*lenpos = (uint32_t*)(this->buffer + this->header_length_offset); if (lenpos)
{
*lenpos = (uint32_t*)(this->buffer + this->header_length_offset);
}
data = chunk_create(this->buffer, get_length(this)); data = chunk_create(this->buffer, get_length(this));
if (this->debug) if (this->debug)
{ {

5
src/libcharon/encoding/message.c
View File

@ -2089,7 +2089,6 @@ METHOD(message_t, fragment, status_t,
host_t *src, *dst; host_t *src, *dst;
chunk_t data; chunk_t data;
status_t status; status_t status;
uint32_t *lenpos;
size_t len; size_t len;
src = this->packet->get_source(this->packet); src = this->packet->get_source(this->packet);
@ -2126,7 +2125,7 @@ METHOD(message_t, fragment, status_t,
DESTROY_IF(generator); DESTROY_IF(generator);
return status; return status;
} }
data = generator->get_chunk(generator, &lenpos); data = generator->get_chunk(generator, NULL);
len = data.len + (encrypted ? encrypted->get_length(encrypted) : 0); len = data.len + (encrypted ? encrypted->get_length(encrypted) : 0);
} }
@ -2182,7 +2181,7 @@ METHOD(message_t, fragment, status_t,
} }
next = encrypted->payload_interface.get_next_type((payload_t*)encrypted); next = encrypted->payload_interface.get_next_type((payload_t*)encrypted);
encrypted->generate_payloads(encrypted, generator); encrypted->generate_payloads(encrypted, generator);
data = generator->get_chunk(generator, &lenpos); data = generator->get_chunk(generator, NULL);
if (!is_encoded(this)) if (!is_encoded(this))
{ {
encrypted->destroy(encrypted); encrypted->destroy(encrypted);