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

- encryptino payload

Browse Source
This commit is contained in:
Martin Willi
2005-11-28 15:43:05 +00:00
parent b9d9f18874
commit 81796a5232
13 changed files with 288 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/charon/Makefile
+1 -3
View File
@@ -21,9 +21,7 @@ LDFLAGS= -lgmp -lpthread
CFLAGS+= -Wall \ CFLAGS+= -Wall \
-DLEAK_DETECTIVE \ -DLEAK_DETECTIVE \
-I. \ -I. \
-g -g #-Werror
# -Werror
# objects is extended by each included Makefile # objects is extended by each included Makefile
OBJS= OBJS=
Source/charon/daemon.h
+1 -1
View File
@@ -27,7 +27,7 @@
#define DAEMON_NAME "charon" #define DAEMON_NAME "charon"
#define NUMBER_OF_WORKING_THREADS 4 #define NUMBER_OF_WORKING_THREADS 1
#define IKEV2_UDP_PORT 500 #define IKEV2_UDP_PORT 500
Source/charon/encoding/generator.c
+112 -96
View File
@@ -348,111 +348,112 @@ static status_t generate_u_int_type (private_generator_t *this,encoding_type_t i
/* now handle each u int type differently */ /* now handle each u int type differently */
switch (int_type) switch (int_type)
{ {
case U_INT_4: case U_INT_4:
{
if (this->current_bit == 0)
{ {
if (this->current_bit == 0) /* highval of current byte in buffer has to be set to the new value*/
{ u_int8_t high_val = *((u_int8_t *)(this->data_struct + offset)) << 4;
/* highval of current byte in buffer has to be set to the new value*/ /* lowval in buffer is not changed */
u_int8_t high_val = *((u_int8_t *)(this->data_struct + offset)) << 4; u_int8_t low_val = *(this->out_position) & 0x0F;
/* lowval in buffer is not changed */ /* highval is set, low_val is not changed */
u_int8_t low_val = *(this->out_position) & 0x0F; *(this->out_position) = high_val | low_val;
/* highval is set, low_val is not changed */ this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position));
*(this->out_position) = high_val | low_val; /* write position is not changed, just bit position is moved */
this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position)); this->current_bit = 4;
/* write position is not changed, just bit position is moved */
this->current_bit = 4;
}
else if (this->current_bit == 4)
{
/* highval in buffer is not changed */
u_int high_val = *(this->out_position) & 0xF0;
/* lowval of current byte in buffer has to be set to the new value*/
u_int low_val = *((u_int8_t *)(this->data_struct + offset)) & 0x0F;
*(this->out_position) = high_val | low_val;
this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position));
this->out_position++;
this->current_bit = 0;
}
else
{
this->logger->log(this->logger, ERROR, "U_INT_4 Type is not 4 Bit aligned");
/* 4 Bit integers must have a 4 bit alignment */
return FAILED;
};
break;
} }
case U_INT_8: else if (this->current_bit == 4)
{ {
/* 8 bit values are written as they are */ /* highval in buffer is not changed */
*this->out_position = *((u_int8_t *)(this->data_struct + offset)); u_int high_val = *(this->out_position) & 0xF0;
/* lowval of current byte in buffer has to be set to the new value*/
u_int low_val = *((u_int8_t *)(this->data_struct + offset)) & 0x0F;
*(this->out_position) = high_val | low_val;
this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position)); this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position));
this->out_position++; this->out_position++;
break;
}
case ATTRIBUTE_TYPE:
{
/* attribute type must not change first bit uf current byte ! */
if (this->current_bit != 1)
{
this->logger->log(this->logger, ERROR, "ATTRIBUTE FORMAT flag is not set");
/* first bit has to be set! */
return FAILED;
}
/* get value of attribute format flag */
u_int8_t attribute_format_flag = *(this->out_position) & 0x80;
/* get attribute type value as 16 bit integer*/
u_int16_t int16_val = htons(*((u_int16_t*)(this->data_struct + offset)));
/* last bit must be unset */
int16_val = int16_val & 0xFF7F;
int16_val = int16_val | attribute_format_flag;
this->logger->log(this->logger, RAW|MOST, " => 0x%x", int16_val);
/* write bytes to buffer (set bit is overwritten)*/
this->write_bytes_to_buffer(this,&int16_val,sizeof(u_int16_t));
this->current_bit = 0; this->current_bit = 0;
break;
}
case U_INT_16:
{
u_int16_t int16_val = htons(*((u_int16_t*)(this->data_struct + offset)));
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)&int16_val, sizeof(int16_val));
this->write_bytes_to_buffer(this,&int16_val,sizeof(u_int16_t));
break;
}
case U_INT_32:
{
u_int32_t int32_val = htonl(*((u_int32_t*)(this->data_struct + offset)));
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)&int32_val, sizeof(int32_val));
this->write_bytes_to_buffer(this,&int32_val,sizeof(u_int32_t));
break;
}
case U_INT_64:
{
/* 64 bit integers are written as two 32 bit integers */
u_int32_t int32_val_low = htonl(*((u_int32_t*)(this->data_struct + offset)));
u_int32_t int32_val_high = htonl(*((u_int32_t*)(this->data_struct + offset) + 1));
this->logger->log_bytes(this->logger, RAW|MOST, " => (low)", (void*)&int32_val_low, sizeof(int32_val_low));
this->logger->log_bytes(this->logger, RAW|MOST, " => (high)", (void*)&int32_val_high, sizeof(int32_val_high));
/* TODO add support for big endian machines */
this->write_bytes_to_buffer(this,&int32_val_high,sizeof(u_int32_t));
this->write_bytes_to_buffer(this,&int32_val_low,sizeof(u_int32_t));
break;
}
case IKE_SPI:
{
/* 64 bit are written as they come :-) */
this->write_bytes_to_buffer(this,(this->data_struct + offset),sizeof(u_int64_t));
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)(this->data_struct + offset), sizeof(u_int64_t));
break;
}
default: }
else
{
this->logger->log(this->logger, ERROR, "U_INT_4 Type is not 4 Bit aligned");
/* 4 Bit integers must have a 4 bit alignment */
return FAILED;
};
break;
}
case U_INT_8:
{
/* 8 bit values are written as they are */
*this->out_position = *((u_int8_t *)(this->data_struct + offset));
this->logger->log(this->logger, RAW|MOST, " => 0x%x", *(this->out_position));
this->out_position++;
break;
}
case ATTRIBUTE_TYPE:
{
/* attribute type must not change first bit uf current byte ! */
if (this->current_bit != 1)
{
this->logger->log(this->logger, ERROR, "ATTRIBUTE FORMAT flag is not set");
/* first bit has to be set! */
return FAILED;
}
/* get value of attribute format flag */
u_int8_t attribute_format_flag = *(this->out_position) & 0x80;
/* get attribute type value as 16 bit integer*/
u_int16_t int16_val = htons(*((u_int16_t*)(this->data_struct + offset)));
/* last bit must be unset */
int16_val = int16_val & 0xFF7F;
int16_val = int16_val | attribute_format_flag;
this->logger->log(this->logger, RAW|MOST, " => 0x%x", int16_val);
/* write bytes to buffer (set bit is overwritten)*/
this->write_bytes_to_buffer(this,&int16_val,sizeof(u_int16_t));
this->current_bit = 0;
break;
}
case U_INT_16:
{
u_int16_t int16_val = htons(*((u_int16_t*)(this->data_struct + offset)));
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)&int16_val, sizeof(int16_val));
this->write_bytes_to_buffer(this,&int16_val,sizeof(u_int16_t));
break;
}
case U_INT_32:
{
u_int32_t int32_val = htonl(*((u_int32_t*)(this->data_struct + offset)));
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)&int32_val, sizeof(int32_val));
this->write_bytes_to_buffer(this,&int32_val,sizeof(u_int32_t));
break;
}
case U_INT_64:
{
/* 64 bit integers are written as two 32 bit integers */
u_int32_t int32_val_low = htonl(*((u_int32_t*)(this->data_struct + offset)));
u_int32_t int32_val_high = htonl(*((u_int32_t*)(this->data_struct + offset) + 1));
this->logger->log_bytes(this->logger, RAW|MOST, " => (low)", (void*)&int32_val_low, sizeof(int32_val_low));
this->logger->log_bytes(this->logger, RAW|MOST, " => (high)", (void*)&int32_val_high, sizeof(int32_val_high));
/* TODO add support for big endian machines */
this->write_bytes_to_buffer(this,&int32_val_high,sizeof(u_int32_t));
this->write_bytes_to_buffer(this,&int32_val_low,sizeof(u_int32_t));
break;
}
case IKE_SPI:
{
/* 64 bit are written as they come :-) */
this->write_bytes_to_buffer(this,(this->data_struct + offset),sizeof(u_int64_t));
this->logger->log_bytes(this->logger, RAW|MOST, " =>", (void*)(this->data_struct + offset), sizeof(u_int64_t));
break;
}
default:
{
this->logger->log(this->logger, ERROR, "U_INT Type %s is not supported", mapping_find(encoding_type_m,int_type)); this->logger->log(this->logger, ERROR, "U_INT Type %s is not supported", mapping_find(encoding_type_m,int_type));
return FAILED; return FAILED;
}
} }
return SUCCESS; return SUCCESS;
} }
@@ -1037,6 +1038,21 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload)
this->logger->log(this->logger, CONTROL|MOST, "attribute value has not fixed size"); this->logger->log(this->logger, CONTROL|MOST, "attribute value has not fixed size");
/* the attribute value is generated */ /* the attribute value is generated */
status = this->generate_from_chunk(this,rules[i].offset); status = this->generate_from_chunk(this,rules[i].offset);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "could not write attribute value from chunk");
return status;
}
}
break;
}
case ENCRYPTED_DATA:
{
status = this->generate_from_chunk(this, rules[i].offset);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "could not write encrypted data from chunk");
return status;
} }
break; break;
} }
Source/charon/encoding/message.c
+138 -111
View File
@@ -34,6 +34,7 @@
#include <utils/logger_manager.h> #include <utils/logger_manager.h>
#include <encoding/payloads/encodings.h> #include <encoding/payloads/encodings.h>
#include <encoding/payloads/payload.h> #include <encoding/payloads/payload.h>
#include <encoding/payloads/encryption_payload.h>
typedef struct supported_payload_entry_t supported_payload_entry_t; typedef struct supported_payload_entry_t supported_payload_entry_t;
@@ -455,7 +456,7 @@ static status_t get_payload_iterator(private_message_t *this, iterator_t **itera
* Implements message_t's generate function. * Implements message_t's generate function.
* See #message_s.generate. * See #message_s.generate.
*/ */
static status_t generate(private_message_t *this, packet_t **packet) static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* signer, packet_t **packet)
{ {
generator_t *generator; generator_t *generator;
ike_header_t *ike_header; ike_header_t *ike_header;
@@ -480,14 +481,13 @@ static status_t generate(private_message_t *this, packet_t **packet)
return INVALID_STATE; return INVALID_STATE;
} }
/* build ike header */
ike_header = ike_header_create(); ike_header = ike_header_create();
if (ike_header == NULL) if (ike_header == NULL)
{ {
return OUT_OF_RES; return OUT_OF_RES;
} }
ike_header->set_exchange_type(ike_header, this->exchange_type); ike_header->set_exchange_type(ike_header, this->exchange_type);
ike_header->set_message_id(ike_header, this->message_id); ike_header->set_message_id(ike_header, this->message_id);
ike_header->set_response_flag(ike_header, !this->is_request); ike_header->set_response_flag(ike_header, !this->is_request);
@@ -509,6 +509,7 @@ static status_t generate(private_message_t *this, packet_t **packet)
ike_header->destroy(ike_header); ike_header->destroy(ike_header);
return OUT_OF_RES; return OUT_OF_RES;
} }
/* generate every payload, except last one */
while(iterator->has_next(iterator)) while(iterator->has_next(iterator))
{ {
iterator->current(iterator, (void**)&next_payload); iterator->current(iterator, (void**)&next_payload);
@@ -524,7 +525,21 @@ static status_t generate(private_message_t *this, packet_t **packet)
} }
iterator->destroy(iterator); iterator->destroy(iterator);
/* build last payload */
payload->set_next_type(payload, NO_PAYLOAD); payload->set_next_type(payload, NO_PAYLOAD);
/* if it's an encryption payload, build it first */
if (payload->get_type(payload) == ENCRYPTED)
{
encryption_payload_t *encryption_payload = (encryption_payload_t*)payload;
encryption_payload->set_signer(encryption_payload, signer);
status = encryption_payload->encrypt(encryption_payload, crypter);
if (status != SUCCESS)
{
generator->destroy(generator);
ike_header->destroy(ike_header);
return status;
}
}
status = generator->generate_payload(generator, payload); status = generator->generate_payload(generator, payload);
if (status != SUCCESS) if (status != SUCCESS)
{ {
@@ -532,28 +547,34 @@ static status_t generate(private_message_t *this, packet_t **packet)
ike_header->destroy(ike_header); ike_header->destroy(ike_header);
return status; return status;
} }
ike_header->destroy(ike_header); ike_header->destroy(ike_header);
/* build packet */
if (this->packet->data.ptr != NULL) if (this->packet->data.ptr != NULL)
{ {
allocator_free(this->packet->data.ptr); allocator_free(this->packet->data.ptr);
} }
status = generator->write_to_chunk(generator, &(this->packet->data)); status = generator->write_to_chunk(generator, &(this->packet->data));
generator->destroy(generator);
if (status != SUCCESS) if (status != SUCCESS)
{ {
generator->destroy(generator);
return status; return status;
} }
/* append integrity checksum if necessary */
if (payload->get_type(payload) == ENCRYPTED)
{
encryption_payload_t *encryption_payload = (encryption_payload_t*)payload;
status = encryption_payload->build_signature(encryption_payload, this->packet->data);
if (status != SUCCESS)
{
return status;
}
}
/* colen packet for caller */
this->packet->clone(this->packet, packet); this->packet->clone(this->packet, packet);
generator->destroy(generator);
this->logger->log(this->logger, CONTROL, "message generated successfully"); this->logger->log(this->logger, CONTROL, "message generated successfully");
return SUCCESS; return SUCCESS;
} }
@@ -617,62 +638,54 @@ static status_t parse_header(private_message_t *this)
} }
/** /**
* Implements message_t's parse_body function. * Implements message_t.parse_body.
* See #message_s.parse_body.
*/ */
static status_t parse_body (private_message_t *this) static status_t parse_body(private_message_t *this, crypter_t *crypter, signer_t *signer)
{ {
status_t status = SUCCESS; status_t status = SUCCESS;
int i;
payload_type_t current_payload_type = this->first_payload; payload_type_t current_payload_type = this->first_payload;
supported_payload_entry_t *supported_payloads;
size_t supported_payloads_count;
this->logger->log(this->logger, CONTROL, "parsing body of message");
if (this->get_supported_payloads (this, &supported_payloads, &supported_payloads_count) != SUCCESS)
{
this->logger->log(this->logger, ERROR, "could not get supported payloads");
return FAILED;
}
this->logger->log(this->logger, CONTROL, "parsing body of message");
while (current_payload_type != NO_PAYLOAD) while (current_payload_type != NO_PAYLOAD)
{ {
payload_t *current_payload; payload_t *current_payload;
bool supported = FALSE;
this->logger->log(this->logger, CONTROL|MORE, "start parsing payload of type %s", this->logger->log(this->logger, CONTROL|MORE, "start parsing payload of type %s",
mapping_find(payload_type_m, current_payload_type)); mapping_find(payload_type_m, current_payload_type));
for (i = 0; i < supported_payloads_count;i++)
{
if (supported_payloads[i].payload_type == current_payload_type)
{
supported = TRUE;
break;
}
}
if (!supported && (current_payload_type != NO_PAYLOAD))
{
/* type not supported */
status = NOT_SUPPORTED;
this->logger->log(this->logger, ERROR, "payload type %s not supported",mapping_find(payload_type_m,current_payload_type));
break;
}
status = this->parser->parse_payload(this->parser,current_payload_type,(payload_t **) &current_payload); status = this->parser->parse_payload(this->parser,current_payload_type,(payload_t **) &current_payload);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR, "payload type %s could not be parsed",mapping_find(payload_type_m,current_payload_type)); this->logger->log(this->logger, ERROR, "payload type %s could not be parsed",mapping_find(payload_type_m,current_payload_type));
break; return status;
} }
status = current_payload->verify(current_payload); status = current_payload->verify(current_payload);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR, "payload type %s could not be verified",mapping_find(payload_type_m,current_payload_type)); this->logger->log(this->logger, ERROR, "payload type %s could not be verified",mapping_find(payload_type_m,current_payload_type));
status = VERIFY_ERROR; status = VERIFY_ERROR;
break; return status;
}
/* encrypted payload must be decrypted */
if (current_payload->get_type(current_payload) == ENCRYPTED)
{
encryption_payload_t *encryption_payload = (encryption_payload_t*)current_payload;
encryption_payload->set_signer(encryption_payload, signer);
status = encryption_payload->verify_signature(encryption_payload, this->packet->data);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "encryption payload signature invaild");
return status;
}
status = encryption_payload->decrypt(encryption_payload, crypter);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "parsing decrypted encryption payload failed");
return status;
}
} }
/* get next payload type */ /* get next payload type */
@@ -681,73 +694,86 @@ static status_t parse_body (private_message_t *this)
status = this->payloads->insert_last(this->payloads,current_payload); status = this->payloads->insert_last(this->payloads,current_payload);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR, "Could not insert current payload to internal list cause of ressource exhausting"); this->logger->log(this->logger, ERROR, "%s on adding payload", mapping_find(status_m, status));
break; return status;;
} }
} }
if (status != SUCCESS) return this->public.verify(&(this->public));
{
/* already parsed payload is destroyed later in destroy call from outside this object */
}
else
{
iterator_t *iterator;
status = this->payloads->create_iterator(this->payloads,&iterator,TRUE);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not create iterator to check supported payloads");
return status;
}
/* check for payloads with wrong count*/
for (i = 0; i < supported_payloads_count;i++)
{
size_t min_occurence = supported_payloads[i].min_occurence;
size_t max_occurence = supported_payloads[i].max_occurence;
payload_type_t payload_type = supported_payloads[i].payload_type;
size_t found_payloads = 0;
iterator->reset(iterator);
while(iterator->has_next(iterator))
{
payload_t *current_payload;
status = iterator->current(iterator,(void **)&current_payload);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not get payload from internal list");
iterator->destroy(iterator);
return status;
}
if (current_payload->get_type(current_payload) == payload_type)
{
found_payloads++;
if (found_payloads > max_occurence)
{
this->logger->log(this->logger, ERROR, "Payload of type %s more than %d times (%d) occured in current message",
mapping_find(payload_type_m,current_payload->get_type(current_payload)),max_occurence,found_payloads);
iterator->destroy(iterator);
return NOT_SUPPORTED;
}
}
}
if (found_payloads < min_occurence)
{
this->logger->log(this->logger, ERROR, "Payload of type %s not occured %d times",
mapping_find(payload_type_m,payload_type),min_occurence);
iterator->destroy(iterator);
return NOT_SUPPORTED;
}
}
iterator->destroy(iterator);
}
return status;
} }
/**
* implements message_t.verify
*/
static status_t verify(private_message_t *this)
{
iterator_t *iterator;
status_t status;
int i;
supported_payload_entry_t *supported_payloads;
size_t supported_payloads_count;
this->logger->log(this->logger, CONTROL|MORE, "verifying message");
status = this->get_supported_payloads(this, &supported_payloads, &supported_payloads_count);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "could not get supported payloads: %s");
return status;
}
status = this->payloads->create_iterator(this->payloads,&iterator,TRUE);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not create iterator to check supported payloads");
return status;
}
/* check for payloads with wrong count*/
for (i = 0; i < supported_payloads_count;i++)
{
size_t min_occurence = supported_payloads[i].min_occurence;
size_t max_occurence = supported_payloads[i].max_occurence;
payload_type_t payload_type = supported_payloads[i].payload_type;
size_t found_payloads = 0;
iterator->reset(iterator);
while(iterator->has_next(iterator))
{
payload_t *current_payload;
status = iterator->current(iterator,(void **)&current_payload);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not get payload from internal list");
iterator->destroy(iterator);
return OUT_OF_RES;
}
if (current_payload->get_type(current_payload) == payload_type)
{
found_payloads++;
if (found_payloads > max_occurence)
{
this->logger->log(this->logger, ERROR, "Payload of type %s more than %d times (%d) occured in current message",
mapping_find(payload_type_m,current_payload->get_type(current_payload)),max_occurence,found_payloads);
iterator->destroy(iterator);
return NOT_SUPPORTED;
}
}
}
if (found_payloads < min_occurence)
{
this->logger->log(this->logger, ERROR, "Payload of type %s not occured %d times",
mapping_find(payload_type_m,payload_type),min_occurence);
iterator->destroy(iterator);
return NOT_SUPPORTED;
}
}
iterator->destroy(iterator);
return SUCCESS;
}
/** /**
@@ -809,14 +835,15 @@ message_t *message_create_from_packet(packet_t *packet)
this->public.set_request = (status_t(*)(message_t*, bool))set_request; this->public.set_request = (status_t(*)(message_t*, bool))set_request;
this->public.get_request = (bool(*)(message_t*))get_request; this->public.get_request = (bool(*)(message_t*))get_request;
this->public.add_payload = (status_t(*)(message_t*,payload_t*))add_payload; this->public.add_payload = (status_t(*)(message_t*,payload_t*))add_payload;
this->public.generate = (status_t (*) (message_t *, packet_t**)) generate; this->public.generate = (status_t (*) (message_t *,crypter_t*,signer_t*,packet_t**)) generate;
this->public.set_source = (status_t (*) (message_t*,host_t*)) set_source; this->public.set_source = (status_t (*) (message_t*,host_t*)) set_source;
this->public.get_source = (status_t (*) (message_t*,host_t**)) get_source; this->public.get_source = (status_t (*) (message_t*,host_t**)) get_source;
this->public.set_destination = (status_t (*) (message_t*,host_t*)) set_destination; this->public.set_destination = (status_t (*) (message_t*,host_t*)) set_destination;
this->public.get_destination = (status_t (*) (message_t*,host_t**)) get_destination; this->public.get_destination = (status_t (*) (message_t*,host_t**)) get_destination;
this->public.get_payload_iterator = (status_t (*) (message_t *, iterator_t **)) get_payload_iterator; this->public.get_payload_iterator = (status_t (*) (message_t *, iterator_t **)) get_payload_iterator;
this->public.parse_header = (status_t (*) (message_t *)) parse_header; this->public.parse_header = (status_t (*) (message_t *)) parse_header;
this->public.parse_body = (status_t (*) (message_t *)) parse_body; this->public.parse_body = (status_t (*) (message_t *,crypter_t*,signer_t*)) parse_body;
this->public.verify = (status_t (*) (message_t*)) verify;
this->public.destroy = (status_t(*)(message_t*))destroy; this->public.destroy = (status_t(*)(message_t*))destroy;
/* public values */ /* public values */
Source/charon/encoding/message.h
+6 -2
View File
@@ -28,6 +28,8 @@
#include <network/packet.h> #include <network/packet.h>
#include <encoding/payloads/ike_header.h> #include <encoding/payloads/ike_header.h>
#include <utils/linked_list.h> #include <utils/linked_list.h>
#include <transforms/crypters/crypter.h>
#include <transforms/signers/signer.h>
typedef struct message_t message_t; typedef struct message_t message_t;
@@ -218,7 +220,7 @@ struct message_t {
* - PARSE_ERROR if corrupted/invalid data found * - PARSE_ERROR if corrupted/invalid data found
* - VERIFY_ERROR if verification of some payload failed * - VERIFY_ERROR if verification of some payload failed
*/ */
status_t (*parse_body) (message_t *this); status_t (*parse_body) (message_t *this, crypter_t *crypter, signer_t *signer);
/** /**
* @brief Generates the UDP packet of specific message * @brief Generates the UDP packet of specific message
@@ -229,7 +231,9 @@ struct message_t {
* - EXCHANGE_TYPE_NOT_SET if exchange type is currently not set * - EXCHANGE_TYPE_NOT_SET if exchange type is currently not set
* .... * ....
*/ */
status_t (*generate) (message_t *this, packet_t **packet); status_t (*generate) (message_t *this, crypter_t *crypter, signer_t *signer, packet_t **packet);
status_t (*verify) (message_t *this);
status_t (*get_source) (message_t *this, host_t **host); status_t (*get_source) (message_t *this, host_t **host);
status_t (*set_source) (message_t *this, host_t *host); status_t (*set_source) (message_t *this, host_t *host);
status_t (*get_destination) (message_t *this, host_t **host); status_t (*get_destination) (message_t *this, host_t **host);
Source/charon/encoding/parser.c
+11
View File
@@ -40,6 +40,7 @@
#include <encoding/payloads/ke_payload.h> #include <encoding/payloads/ke_payload.h>
#include <encoding/payloads/nonce_payload.h> #include <encoding/payloads/nonce_payload.h>
#include <encoding/payloads/notify_payload.h> #include <encoding/payloads/notify_payload.h>
#include <encoding/payloads/encryption_payload.h>
@@ -836,6 +837,16 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ
} }
break; break;
} }
case ENCRYPTED_DATA:
{
size_t data_length = payload_length - ENCRYPTION_PAYLOAD_HEADER_LENGTH ;
if (this->parse_chunk(this, rule_number, output + rule->offset, data_length) != SUCCESS)
{
pld->destroy(pld);
return PARSE_ERROR;
}
break;
}
default: default:
{ {
this->logger->log(this->logger, ERROR, " no rule to parse rule %d %s (%d)", rule_number, mapping_find(encoding_type_m, rule->type), rule->type); this->logger->log(this->logger, ERROR, " no rule to parse rule %d %s (%d)", rule_number, mapping_find(encoding_type_m, rule->type), rule->type);
Source/charon/encoding/payloads/Makefile.payloads
+4
View File
@@ -53,4 +53,8 @@ $(BUILD_DIR)transform_attribute.o : $(PAYLOADS_DIR)transform_attribute.c $(PAYL
OBJS+= $(BUILD_DIR)transform_substructure.o OBJS+= $(BUILD_DIR)transform_substructure.o
$(BUILD_DIR)transform_substructure.o : $(PAYLOADS_DIR)transform_substructure.c $(PAYLOADS_DIR)transform_substructure.h $(BUILD_DIR)transform_substructure.o : $(PAYLOADS_DIR)transform_substructure.c $(PAYLOADS_DIR)transform_substructure.h
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
OBJS+= $(BUILD_DIR)encryption_payload.o
$(BUILD_DIR)encryption_payload.o : $(PAYLOADS_DIR)encryption_payload.c $(PAYLOADS_DIR)encryption_payload.h
$(CC) $(CFLAGS) -c -o $@ $<
Source/charon/encoding/payloads/encodings.h
+5 -2
View File
@@ -286,7 +286,7 @@ enum encoding_type_t{
*/ */
ATTRIBUTE_LENGTH_OR_VALUE, ATTRIBUTE_LENGTH_OR_VALUE,
/* /**
* Depending on the field of type ATTRIBUTE_FORMAT * Depending on the field of type ATTRIBUTE_FORMAT
* this field is available or missing and so parsed/generated * this field is available or missing and so parsed/generated
* or not parsed/not generated * or not parsed/not generated
@@ -316,7 +316,10 @@ enum encoding_type_t{
* *
* When parsing 8 bytes are read and written into the u_int64_t pointing to. * When parsing 8 bytes are read and written into the u_int64_t pointing to.
*/ */
IKE_SPI IKE_SPI,
ENCRYPTED_DATA,
}; };
/** /**
Source/charon/sa/ike_sa.c
+1 -1
View File
@@ -529,7 +529,7 @@ status_t resend_last_reply (private_ike_sa_t *this)
packet_t *packet; packet_t *packet;
status_t status; status_t status;
status = this->last_responded_message->generate(this->last_responded_message, &packet); status = this->last_responded_message->generate(this->last_responded_message, NULL, NULL, &packet);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR, "Could not generate message to resent"); this->logger->log(this->logger, ERROR, "Could not generate message to resent");
Source/charon/sa/states/ike_sa_init_requested.c
+1 -1
View File
@@ -108,7 +108,7 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t
} }
/* parse incoming message */ /* parse incoming message */
status = message->parse_body(message); status = message->parse_body(message, NULL, NULL);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR | MORE, "Could not parse body"); this->logger->log(this->logger, ERROR | MORE, "Could not parse body");
Source/charon/sa/states/initiator_init.c
+1 -1
View File
@@ -239,7 +239,7 @@ static status_t initiate_connection (private_initiator_init_t *this, char *name)
/* generate packet */ /* generate packet */
this->logger->log(this->logger, CONTROL|MOST, "generate packet from message"); this->logger->log(this->logger, CONTROL|MOST, "generate packet from message");
status = message->generate(message, &packet); status = message->generate(message, NULL, NULL, &packet);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR, "Fatal error: could not generate packet from message"); this->logger->log(this->logger, ERROR, "Fatal error: could not generate packet from message");
Source/charon/sa/states/responder_init.c
+6 -6
View File
@@ -194,7 +194,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
this->ike_sa->set_other_host(this->ike_sa, other_host); this->ike_sa->set_other_host(this->ike_sa, other_host);
/* parse incoming message */ /* parse incoming message */
status = message->parse_body(message); status = message->parse_body(message, NULL, NULL);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR | MORE, "Could not parse body of request message"); this->logger->log(this->logger, ERROR | MORE, "Could not parse body of request message");
@@ -411,7 +411,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
return status; return status;
} }
this ->logger->log(this->logger, CONTROL|MOST, "add SA payload to message"); this->logger->log(this->logger, CONTROL|MOST, "add SA payload to message");
status = response->add_payload(response, payload); status = response->add_payload(response, payload);
if (status != SUCCESS) if (status != SUCCESS)
{ {
@@ -427,7 +427,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
return status; return status;
} }
this ->logger->log(this->logger, CONTROL|MOST, "add KE payload to message"); this->logger->log(this->logger, CONTROL|MOST, "add KE payload to message");
status = response->add_payload(response, payload); status = response->add_payload(response, payload);
if (status != SUCCESS) if (status != SUCCESS)
{ {
@@ -443,7 +443,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
return status; return status;
} }
this ->logger->log(this->logger, CONTROL|MOST, "add nonce payload to message"); this->logger->log(this->logger, CONTROL|MOST, "add nonce payload to message");
status = response->add_payload(response, payload); status = response->add_payload(response, payload);
if (status != SUCCESS) if (status != SUCCESS)
{ {
@@ -452,8 +452,8 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
} }
/* generate packet */ /* generate packet */
this ->logger->log(this->logger, CONTROL|MOST, "generate packet from message"); this->logger->log(this->logger, CONTROL|MOST, "generate packet from message");
status = response->generate(response, &packet); status = response->generate(response, NULL, NULL, &packet);
if (status != SUCCESS) if (status != SUCCESS)
{ {
this->logger->log(this->logger, ERROR, "Fatal error: could not generate packet from message"); this->logger->log(this->logger, ERROR, "Fatal error: could not generate packet from message");
Source/charon/utils/logger_manager.c
+1 -1
View File
@@ -151,11 +151,11 @@ static logger_t *create_logger(private_logger_manager_t *this, logger_context_t
logger_level |= FULL; logger_level |= FULL;
case IKE_SA_MANAGER: case IKE_SA_MANAGER:
case MESSAGE: case MESSAGE:
case WORKER:
logger_level |= ALL; logger_level |= ALL;
case PARSER: case PARSER:
case GENERATOR: case GENERATOR:
case THREAD_POOL: case THREAD_POOL:
case WORKER:
case SCHEDULER: case SCHEDULER:
case SENDER: case SENDER:
case RECEIVER: case RECEIVER: