diff options
| -rw-r--r-- | Source/charon/encoding/generator.c | 291 | ||||
| -rw-r--r-- | Source/charon/encoding/generator.h | 25 | ||||
| -rw-r--r-- | Source/charon/encoding/message.c | 23 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/encryption_payload.c | 19 | ||||
| -rw-r--r-- | Source/charon/testcases/generator_test.c | 82 |
5 files changed, 126 insertions, 314 deletions
diff --git a/Source/charon/encoding/generator.c b/Source/charon/encoding/generator.c index 0c32cec12..e1da40312 100644 --- a/Source/charon/encoding/generator.c +++ b/Source/charon/encoding/generator.c @@ -45,11 +45,11 @@ typedef struct private_generator_t private_generator_t; /** - * Private part of a generator_t object + * Private part of a generator_t object. */ struct private_generator_t { /** - * Public part of a generator_t object + * Public part of a generator_t object. */ generator_t public; @@ -64,10 +64,11 @@ struct private_generator_t { * ATTRIBUTE_TYPE is also generated in this function * @param offset offset of value in data struct * @param generator_contexts generator_contexts_t object where the context is written or read from - * @return - SUCCESS if succeeded - * - OUT_OF_RES if out of ressources + * @return + * - SUCCESS + * - FAILED if allignment is wrong */ - status_t (*generate_u_int_type) (private_generator_t *this,encoding_type_t int_type,u_int32_t offset); + void (*generate_u_int_type) (private_generator_t *this,encoding_type_t int_type,u_int32_t offset); /** * Get size of current buffer in bytes. @@ -108,11 +109,8 @@ struct private_generator_t { * @param this private_generator_t object * @param generator_contexts generator_contexts_t object where the context is written or read from * @param bits number of bits to generate - * @return - SUCCESS if succeeded - * - OUT_OF_RES if out of ressources - * - FAILED if bit count not supported */ - status_t (*generate_reserved_field) (private_generator_t *this,int bits); + void (*generate_reserved_field) (private_generator_t *this,int bits); /** * Generates a FLAG field @@ -120,10 +118,8 @@ struct private_generator_t { * @param this private_generator_t object * @param generator_contexts generator_contexts_t object where the context is written or read from * @param offset offset of flag value in data struct - * @return - SUCCESS if succeeded - * - OUT_OF_RES if out of ressources */ - status_t (*generate_flag) (private_generator_t *this,u_int32_t offset); + void (*generate_flag) (private_generator_t *this,u_int32_t offset); /** * Writes the current buffer content into a chunk_t @@ -132,21 +128,16 @@ struct private_generator_t { * * @param this calling private_generator_t object * @param data pointer of chunk_t to write to - * @return - * - SUCCESSFUL if succeeded - * - OUT_OF_RES otherwise */ - status_t (*write_chunk) (private_generator_t *this,chunk_t *data); + void (*write_chunk) (private_generator_t *this,chunk_t *data); /** * Generates a bytestream from a chunk_t * * @param this private_generator_t object * @param offset offset of chunk_t value in data struct - * @return - SUCCESS if succeeded - * - OUT_OF_RES if out of ressources */ - status_t (*generate_from_chunk) (private_generator_t *this,u_int32_t offset); + void (*generate_from_chunk) (private_generator_t *this,u_int32_t offset); /** * Makes sure enough space is available in buffer to store amount of bits. @@ -156,11 +147,8 @@ struct private_generator_t { * * @param this calling private_generator_t object * @param bits number of bits to make available in buffer - * @return - * - SUCCESSFUL if succeeded - * - OUT_OF_RES otherwise */ - status_t (*make_space_available) (private_generator_t *this,size_t bits); + void (*make_space_available) (private_generator_t *this,size_t bits); /** * Writes a specific amount of byte into the buffer. @@ -171,11 +159,8 @@ struct private_generator_t { * @param this calling private_generator_t object * @param bytes pointer to bytes to write * @param number_of_bytes number of bytes to write into buffer - * @return - * - SUCCESSFUL if succeeded - * - OUT_OF_RES otherwise */ - status_t (*write_bytes_to_buffer) (private_generator_t *this,void * bytes,size_t number_of_bytes); + void (*write_bytes_to_buffer) (private_generator_t *this,void * bytes,size_t number_of_bytes); /** @@ -187,11 +172,8 @@ struct private_generator_t { * @param bytes pointer to bytes to write * @param number_of_bytes number of bytes to write into buffer * @param offset offset to write the data into - * @return - * - SUCCESSFUL if succeeded - * - OUT_OF_RES otherwise */ - status_t (*write_bytes_to_buffer_at_offset) (private_generator_t *this,void * bytes,size_t number_of_bytes,u_int32_t offset); + void (*write_bytes_to_buffer_at_offset) (private_generator_t *this,void * bytes,size_t number_of_bytes,u_int32_t offset); /** * Buffer used to generate the data into. @@ -296,10 +278,9 @@ static u_int32_t get_current_buffer_offset (private_generator_t *this) * Implements private_generator_t's generate_u_int_type function. * See #private_generator_s.generate_u_int_type. */ -static status_t generate_u_int_type (private_generator_t *this,encoding_type_t int_type,u_int32_t offset) +static void generate_u_int_type (private_generator_t *this,encoding_type_t int_type,u_int32_t offset) { size_t number_of_bits = 0; - status_t status; /* find out number of bits of each U_INT type to check for enough space in buffer */ @@ -328,7 +309,10 @@ static status_t generate_u_int_type (private_generator_t *this,encoding_type_t i break; default: - return FAILED; + this->logger->log(this->logger, ERROR, "U_INT Type %s is not supported", + mapping_find(encoding_type_m,int_type)); + + return; } /* U_INT Types of multiple then 8 bits must be aligned */ if (((number_of_bits % 8) == 0) && (this->current_bit != 0)) @@ -336,15 +320,11 @@ static status_t generate_u_int_type (private_generator_t *this,encoding_type_t i this->logger->log(this->logger, ERROR, "U_INT Type %s is not 8 Bit aligned", mapping_find(encoding_type_m,int_type)); /* current bit has to be zero for values multiple of 8 bits */ - return FAILED; + return; } /* make sure enough space is available in buffer */ - status = this->make_space_available(this,number_of_bits); - if (status != SUCCESS) - { - return status; - } + this->make_space_available(this,number_of_bits); /* now handle each u int type differently */ switch (int_type) { @@ -378,7 +358,7 @@ static status_t generate_u_int_type (private_generator_t *this,encoding_type_t i { 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; + return; }; break; } @@ -398,7 +378,7 @@ static status_t generate_u_int_type (private_generator_t *this,encoding_type_t i { this->logger->log(this->logger, ERROR, "ATTRIBUTE FORMAT flag is not set"); /* first bit has to be set! */ - return FAILED; + return; } /* get value of attribute format flag */ u_int8_t attribute_format_flag = *(this->out_position) & 0x80; @@ -452,32 +432,25 @@ static status_t generate_u_int_type (private_generator_t *this,encoding_type_t i default: { this->logger->log(this->logger, ERROR, "U_INT Type %s is not supported", mapping_find(encoding_type_m,int_type)); - return FAILED; + return; } } - return SUCCESS; } /** * Implements private_generator_t's generate_reserved_field function. * See #private_generator_s.generate_reserved_field. */ -static status_t generate_reserved_field(private_generator_t *this,int bits) +static void generate_reserved_field(private_generator_t *this,int bits) { - status_t status; - /* only one bit or 8 bit fields are supported */ if ((bits != 1) && (bits != 8)) { this->logger->log(this->logger, ERROR, "Reserved field of %d bits cannot be generated", bits); - return FAILED; + return ; } /* make sure enough space is available in buffer */ - status = this->make_space_available(this,bits); - if (status != SUCCESS) - { - return status; - } + this->make_space_available(this,bits); if (bits == 1) { @@ -506,24 +479,19 @@ static status_t generate_reserved_field(private_generator_t *this,int bits) this->logger->log(this->logger, ERROR, "Reserved field cannot be written cause allignement of current bit is %d", this->current_bit); - return FAILED; + return; } *(this->out_position) = 0x00; this->out_position++; } - - return SUCCESS; - - } /** * Implements private_generator_t's generate_flag function. * See #private_generator_s.generate_flag. */ -static status_t generate_flag (private_generator_t *this,u_int32_t offset) +static void generate_flag (private_generator_t *this,u_int32_t offset) { - status_t status; /* value of current flag */ u_int8_t flag_value; /* position of flag in current byte */ @@ -535,11 +503,7 @@ static status_t generate_flag (private_generator_t *this,u_int32_t offset) flag = (flag_value << (7 - this->current_bit)); /* make sure one bit is available in buffer */ - status = this->make_space_available(this,1); - if (status != SUCCESS) - { - return status; - } + this->make_space_available(this,1); if (this->current_bit == 0) { /* memory must be zero */ @@ -557,19 +521,18 @@ static status_t generate_flag (private_generator_t *this,u_int32_t offset) this->current_bit = this->current_bit % 8; this->out_position++; } - return SUCCESS; } /** * Implements private_generator_t's generate_from_chunk function. * See #private_generator_s.generate_from_chunk. */ -static status_t generate_from_chunk (private_generator_t *this,u_int32_t offset) +static void generate_from_chunk (private_generator_t *this,u_int32_t offset) { if (this->current_bit != 0) { this->logger->log(this->logger, ERROR, "can not generate a chunk at Bitpos %d", this->current_bit); - return FAILED; + return ; } /* position in buffer */ @@ -578,15 +541,14 @@ static status_t generate_from_chunk (private_generator_t *this,u_int32_t offset) this->logger->log_chunk(this->logger, RAW|MOST, " =>", attribute_value); /* use write_bytes_to_buffer function to do the job */ - return this->write_bytes_to_buffer(this,attribute_value->ptr,attribute_value->len); - + this->write_bytes_to_buffer(this,attribute_value->ptr,attribute_value->len); } /** * Implements private_generator_t's generator_context_make_space_available function. * See #private_generator_s.generator_context_make_space_available. */ -static status_t make_space_available (private_generator_t *this, size_t bits) +static void make_space_available (private_generator_t *this, size_t bits) { while (((this->get_current_buffer_space(this) * 8) - this->current_bit) < bits) { @@ -604,7 +566,6 @@ static status_t make_space_available (private_generator_t *this, size_t bits) if (new_buffer == NULL) { this->logger->log(this->logger, ERROR, "reallocation of gen buffer failed!!!"); - return OUT_OF_RES; } this->buffer = new_buffer; @@ -612,24 +573,18 @@ static status_t make_space_available (private_generator_t *this, size_t bits) this->out_position = (this->buffer + out_position_offset); this->roof_position = (this->buffer + new_buffer_size); } - return SUCCESS; } /** * Implements private_generator_t's write_bytes_to_buffer function. * See #private_generator_s.write_bytes_to_buffer. */ -static status_t write_bytes_to_buffer (private_generator_t *this,void * bytes, size_t number_of_bytes) +static void write_bytes_to_buffer (private_generator_t *this,void * bytes, size_t number_of_bytes) { int i; - status_t status; u_int8_t *read_position = (u_int8_t *) bytes; - status = this->make_space_available(this,number_of_bytes * 8); - if (status != SUCCESS) - { - return status; - } + this->make_space_available(this,number_of_bytes * 8); for (i = 0; i < number_of_bytes; i++) { @@ -637,17 +592,15 @@ static status_t write_bytes_to_buffer (private_generator_t *this,void * bytes, s read_position++; this->out_position++; } - return status; } /** * Implements private_generator_t's write_bytes_to_buffer_at_offset function. * See #private_generator_s.write_bytes_to_buffer_at_offset. */ -static status_t write_bytes_to_buffer_at_offset (private_generator_t *this,void * bytes,size_t number_of_bytes,u_int32_t offset) +static void write_bytes_to_buffer_at_offset (private_generator_t *this,void * bytes,size_t number_of_bytes,u_int32_t offset) { int i; - status_t status; u_int8_t *read_position = (u_int8_t *) bytes; u_int8_t *write_position; u_int32_t free_space_after_offset = (this->get_current_buffer_size(this) - offset); @@ -655,7 +608,7 @@ static status_t write_bytes_to_buffer_at_offset (private_generator_t *this,void /* check first if enough space for new data is available */ if (number_of_bytes > free_space_after_offset) { - status = this->make_space_available(this,(number_of_bytes - free_space_after_offset) * 8); + this->make_space_available(this,(number_of_bytes - free_space_after_offset) * 8); } write_position = this->buffer + offset; @@ -665,14 +618,14 @@ static status_t write_bytes_to_buffer_at_offset (private_generator_t *this,void read_position++; write_position++; } - return SUCCESS; + } /** * Implements generator_t's write_chunk function. * See #generator_s.write_chunk. */ -static status_t write_to_chunk (private_generator_t *this,chunk_t *data) +static void write_to_chunk (private_generator_t *this,chunk_t *data) { size_t data_length = this->get_current_data_length(this); u_int32_t header_length_field = data_length; @@ -687,28 +640,19 @@ static status_t write_to_chunk (private_generator_t *this,chunk_t *data) if (this->current_bit > 0) data_length++; data->ptr = allocator_alloc(data_length); - if (data->ptr == NULL) - { - data->len = 0; - this->logger->log(this->logger, ERROR, "not enougth ressources to allocate chunk"); - return OUT_OF_RES; - } memcpy(data->ptr,this->buffer,data_length); data->len = data_length; this->logger->log_chunk(this->logger, RAW, "generated data of this parser", data); - - return SUCCESS; } /** * Implements generator_t's generate_payload function. * See #generator_s.generate_payload. */ -static status_t generate_payload (private_generator_t *this,payload_t *payload) +static void generate_payload (private_generator_t *this,payload_t *payload) { int i; - status_t status; this->data_struct = payload; size_t rule_count; encoding_rule_t *rules; @@ -723,14 +667,13 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) payload_start = this->out_position; this->logger->log(this->logger, CONTROL, "generating payload of type %s", - mapping_find(payload_type_m,payload_type)); + mapping_find(payload_type_m,payload_type)); /* each payload has its own encoding rules */ payload->get_encoding_rules(payload,&rules,&rule_count); for (i = 0; i < rule_count;i++) { - status = SUCCESS; this->logger->log(this->logger, CONTROL|MORE, " generating rule %d %s", i, mapping_find(encoding_type_m,rules[i].type)); switch (rules[i].type) @@ -744,22 +687,22 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) case IKE_SPI: case ATTRIBUTE_TYPE: { - status = this->generate_u_int_type(this,rules[i].type,rules[i].offset); + this->generate_u_int_type(this,rules[i].type,rules[i].offset); break; } case RESERVED_BIT: { - status = this->generate_reserved_field(this,1); + this->generate_reserved_field(this,1); break; } case RESERVED_BYTE: { - status = this->generate_reserved_field(this,8); + this->generate_reserved_field(this,8); break; } case FLAG: { - status = this->generate_flag(this,rules[i].offset); + this->generate_flag(this,rules[i].offset); break; } case PAYLOAD_LENGTH: @@ -767,7 +710,7 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) /* position of payload lenght field is temporary stored */ this->last_payload_length_position_offset = this->get_current_buffer_offset(this); /* payload length is generated like an U_INT_16 */ - status = this->generate_u_int_type(this,U_INT_16,rules[i].offset); + this->generate_u_int_type(this,U_INT_16,rules[i].offset); break; } case HEADER_LENGTH: @@ -775,53 +718,38 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) /* position of header length field is temporary stored */ this->header_length_position_offset = this->get_current_buffer_offset(this); /* header length is generated like an U_INT_32 */ - status = this->generate_u_int_type(this,U_INT_32,rules[i].offset); + this->generate_u_int_type(this,U_INT_32,rules[i].offset); break; } case SPI_SIZE: /* spi size is handled as 8 bit unsigned integer */ - status = this->generate_u_int_type(this,U_INT_8,rules[i].offset); + this->generate_u_int_type(this,U_INT_8,rules[i].offset); /* last spi size is temporary stored */ this->last_spi_size = *((u_int8_t *)(this->data_struct + rules[i].offset)); break; case SPI: { /* the SPI value is generated from chunk */ - status = this->generate_from_chunk(this,rules[i].offset); + this->generate_from_chunk(this,rules[i].offset); break; } case KEY_EXCHANGE_DATA: { /* the Key Exchange Data value is generated from chunk */ - status = this->generate_from_chunk(this,rules[i].offset); - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "could no write key exchange data from chunk"); - return status; - } - + this->generate_from_chunk(this,rules[i].offset); + u_int32_t payload_length_position_offset = this->last_payload_length_position_offset; /* Length of KE_PAYLOAD is calculated */ u_int16_t length_of_ke_payload = KE_PAYLOAD_HEADER_LENGTH + ((chunk_t *)(this->data_struct + rules[i].offset))->len; u_int16_t int16_val = htons(length_of_ke_payload); - status = this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "could not write payload length into buffer"); - return status; - } + this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); break; } case NOTIFICATION_DATA: { /* the Notification Data value is generated from chunk */ - status = this->generate_from_chunk(this,rules[i].offset); - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "Could not generate notification data from chunk"); - return status; - } + this->generate_from_chunk(this,rules[i].offset); u_int32_t payload_length_position_offset = this->last_payload_length_position_offset; /* Length of Notification PAYLOAD is calculated */ @@ -829,36 +757,20 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) length_of_notify_payload += this->last_spi_size; u_int16_t int16_val = htons(length_of_notify_payload); - status = this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "could not write payload length into buffer"); - return status; - } + this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); break; } case NONCE_DATA: { /* the Nonce Data value is generated from chunk */ - status = this->generate_from_chunk(this, rules[i].offset); - - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "could not write nonce data from chunk"); - return status; - } + this->generate_from_chunk(this, rules[i].offset); u_int32_t payload_length_position_offset = this->last_payload_length_position_offset; /* Length of nonce PAYLOAD is calculated */ u_int16_t length_of_nonce_payload = NONCE_PAYLOAD_HEADER_LENGTH + ((chunk_t *)(this->data_struct + rules[i].offset))->len; u_int16_t int16_val = htons(length_of_nonce_payload); - status = this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "could not write payload length into buffer"); - return status; - } + this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); break; } case PROPOSALS: @@ -873,12 +785,7 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) iterator_t *iterator; /* create forward iterator */ - status = proposals->create_iterator(proposals,&iterator,TRUE); - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "could not create iterator for proposals"); - return status; - } + proposals->create_iterator(proposals,&iterator,TRUE); /* every proposal is processed (iterative call )*/ while (iterator->has_next(iterator)) { @@ -886,20 +793,11 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) u_int32_t before_generate_position_offset; u_int32_t after_generate_position_offset; - status = iterator->current(iterator,(void **)¤t_proposal); - if (status != SUCCESS) - { - iterator->destroy(iterator); - return status; - } + iterator->current(iterator,(void **)¤t_proposal); + before_generate_position_offset = this->get_current_buffer_offset(this); - status = this->public.generate_payload(&(this->public),current_proposal); + this->public.generate_payload(&(this->public),current_proposal); after_generate_position_offset = this->get_current_buffer_offset(this); - if (status != SUCCESS) - { - iterator->destroy(iterator); - return status; - } /* increase size of transform */ length_of_sa_payload += (after_generate_position_offset - before_generate_position_offset); @@ -907,12 +805,7 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) iterator->destroy(iterator); int16_val = htons(length_of_sa_payload); - status = this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); - if (status != SUCCESS) - { - this->logger->log(this->logger, ERROR, "could not write payload length into buffer"); - return status; - } + this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); break; } @@ -926,32 +819,18 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) iterator_t *iterator; /* create forward iterator */ - status = transforms->create_iterator(transforms,&iterator,TRUE); - if (status != SUCCESS) - { - return status; - } + transforms->create_iterator(transforms,&iterator,TRUE); while (iterator->has_next(iterator)) { payload_t *current_transform; u_int32_t before_generate_position_offset; u_int32_t after_generate_position_offset; - status = iterator->current(iterator,(void **)¤t_transform); - if (status != SUCCESS) - { - iterator->destroy(iterator); - return status; - } + iterator->current(iterator,(void **)¤t_transform); before_generate_position_offset = this->get_current_buffer_offset(this); - status = this->public.generate_payload(&(this->public),current_transform); + this->public.generate_payload(&(this->public),current_transform); after_generate_position_offset = this->get_current_buffer_offset(this); - if (status != SUCCESS) - { - iterator->destroy(iterator); - return status; - } /* increase size of transform */ length_of_proposal += (after_generate_position_offset - before_generate_position_offset); @@ -975,23 +854,14 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) iterator_t *iterator; /* create forward iterator */ - status = transform_attributes->create_iterator(transform_attributes,&iterator,TRUE); - if (status != SUCCESS) - { - return status; - } + transform_attributes->create_iterator(transform_attributes,&iterator,TRUE); while (iterator->has_next(iterator)) { payload_t *current_attribute; u_int32_t before_generate_position_offset; u_int32_t after_generate_position_offset; - status = iterator->current(iterator,(void **)¤t_attribute); - if (status != SUCCESS) - { - iterator->destroy(iterator); - return status; - } + iterator->current(iterator,(void **)¤t_attribute); before_generate_position_offset = this->get_current_buffer_offset(this); this->public.generate_payload(&(this->public),current_attribute); @@ -1010,7 +880,7 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) } case ATTRIBUTE_FORMAT: { - status = this->generate_flag(this,rules[i].offset); + this->generate_flag(this,rules[i].offset); /* Attribute format is a flag which is stored in context*/ this->attribute_format = *((bool *) (this->data_struct + rules[i].offset)); break; @@ -1020,13 +890,13 @@ static status_t generate_payload (private_generator_t *this,payload_t *payload) { if (this->attribute_format == FALSE) { - status = this->generate_u_int_type(this,U_INT_16,rules[i].offset); + this->generate_u_int_type(this,U_INT_16,rules[i].offset); /* this field hold the length of the attribute */ this->attribute_length = *((u_int16_t *)(this->data_struct + rules[i].offset)); } else { - status = this->generate_u_int_type(this,U_INT_16,rules[i].offset); + this->generate_u_int_type(this,U_INT_16,rules[i].offset); // status = this->write_bytes_to_buffer(this,(this->data_struct + rules[i].offset),2); } break; @@ -1037,35 +907,24 @@ 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"); /* the attribute value is generated */ - 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; - } + this->generate_from_chunk(this,rules[i].offset); } 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; - } + this->generate_from_chunk(this, rules[i].offset); break; } default: this->logger->log(this->logger, ERROR, "field type %s is not supported", mapping_find(encoding_type_m,rules[i].type)); - return NOT_SUPPORTED; + return; } } this->logger->log_bytes(this->logger, RAW|MORE, "generated data for this payload", payload_start, this->out_position-payload_start); - return status; } /** @@ -1094,9 +953,9 @@ generator_t * generator_create() } /* initiate public functions */ - this->public.generate_payload = (status_t(*)(generator_t*, payload_t *)) generate_payload; - this->public.destroy = (status_t(*)(generator_t*)) destroy; - this->public.write_to_chunk = (status_t (*) (generator_t *,chunk_t *)) write_to_chunk; + this->public.generate_payload = (void(*)(generator_t*, payload_t *)) generate_payload; + this->public.destroy = (void(*)(generator_t*)) destroy; + this->public.write_to_chunk = (void (*) (generator_t *,chunk_t *)) write_to_chunk; /* initiate private functions */ diff --git a/Source/charon/encoding/generator.h b/Source/charon/encoding/generator.h index 81f0bd9c4..7637f4937 100644 --- a/Source/charon/encoding/generator.h +++ b/Source/charon/encoding/generator.h @@ -29,7 +29,7 @@ /** * Generating is done in a data buffer. - * This is thehe start size of this buffer in Bytes. + * This is thehe start size of this buffer in bytes. */ #define GENERATOR_DATA_BUFFER_SIZE 500 @@ -52,36 +52,29 @@ struct generator_t { * * @param this generator_t object * @param[in] payload interface payload_t implementing object - * @return - * - SUCCESSFUL if succeeded - * - OUT_OF_RES if out of ressources */ - status_t (*generate_payload) (generator_t *this,payload_t *payload); + void (*generate_payload) (generator_t *this,payload_t *payload); /** - * Writes all generated data of current generator context to a chunk + * Writes all generated data of current generator context to a chunk. * * @param this generator_t object - * * @param[out] data chunk to write the data to - * @return - * @return - * - SUCCESSFUL if succeeded - * - OUT_OF_RES otherwise + * @param[out] data chunk to write the data to */ - status_t (*write_to_chunk) (generator_t *this,chunk_t *data); + void (*write_to_chunk) (generator_t *this,chunk_t *data); /** * @brief Destroys a generator_t object. * * @param this generator_t object - * - * @return always success */ - status_t (*destroy) (generator_t *this); + void (*destroy) (generator_t *this); }; /** - * Constructor to create a generator + * Constructor to create a generator. + * + * Returns a new generator_t object. * */ generator_t * generator_create(); diff --git a/Source/charon/encoding/message.c b/Source/charon/encoding/message.c index d1fd3a2f3..5fb6fa33d 100644 --- a/Source/charon/encoding/message.c +++ b/Source/charon/encoding/message.c @@ -514,13 +514,8 @@ static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* { iterator->current(iterator, (void**)&next_payload); payload->set_next_type(payload, next_payload->get_type(next_payload)); - status = generator->generate_payload(generator, payload); - if (status != SUCCESS) - { - generator->destroy(generator); - ike_header->destroy(ike_header); - return status; - } + generator->generate_payload(generator, payload); + payload = next_payload; } iterator->destroy(iterator); @@ -540,13 +535,7 @@ static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* return status; } } - status = generator->generate_payload(generator, payload); - if (status != SUCCESS) - { - generator->destroy(generator); - ike_header->destroy(ike_header); - return status; - } + generator->generate_payload(generator, payload); ike_header->destroy(ike_header); /* build packet */ @@ -554,12 +543,8 @@ static status_t generate(private_message_t *this, crypter_t *crypter, signer_t* { allocator_free(this->packet->data.ptr); } - status = generator->write_to_chunk(generator, &(this->packet->data)); + generator->write_to_chunk(generator, &(this->packet->data)); generator->destroy(generator); - if (status != SUCCESS) - { - return status; - } /* append integrity checksum if necessary */ if (payload->get_type(payload) == ENCRYPTED) diff --git a/Source/charon/encoding/payloads/encryption_payload.c b/Source/charon/encoding/payloads/encryption_payload.c index 156f880cd..d94576b61 100644 --- a/Source/charon/encoding/payloads/encryption_payload.c +++ b/Source/charon/encoding/payloads/encryption_payload.c @@ -586,32 +586,21 @@ static status_t generate(private_encryption_payload_t *this) iterator->current(iterator, (void**)&next_payload); current_payload->set_next_type(current_payload, next_payload->get_type(next_payload)); - status = generator->generate_payload(generator, current_payload); - if (status != SUCCESS) - { - generator->destroy(generator); - iterator->destroy(iterator); - return status; - } + generator->generate_payload(generator, current_payload); current_payload = next_payload; } iterator->destroy(iterator); /* build last payload */ current_payload->set_next_type(current_payload, NO_PAYLOAD); - status = generator->generate_payload(generator, current_payload); - if (status != SUCCESS) - { - generator->destroy(generator); - return status; - } + generator->generate_payload(generator, current_payload); /* free already generated data */ allocator_free(this->decrypted.ptr); - status = generator->write_to_chunk(generator, &(this->decrypted)); + generator->write_to_chunk(generator, &(this->decrypted)); generator->destroy(generator); - return status; + return SUCCESS; } static status_t parse(private_encryption_payload_t *this) diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c index 95a124984..4dacbf30f 100644 --- a/Source/charon/testcases/generator_test.c +++ b/Source/charon/testcases/generator_test.c @@ -64,10 +64,9 @@ void test_generator_with_header_payload(tester_t *tester) generator = generator_create(); tester->assert_true(tester,(generator != NULL), "generator create check"); - status = generator->generate_payload(generator,(payload_t *) header_data); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); + generator->generate_payload(generator,(payload_t *) header_data); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->write_to_chunk(generator,&generated_data); u_int8_t expected_generation[] = { 0x01,0x00,0x00,0x00, @@ -85,7 +84,7 @@ void test_generator_with_header_payload(tester_t *tester) tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data 1"); allocator_free_chunk(&generated_data); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); header_data->set_initiator_spi(header_data,0x22000054231234LL); header_data->set_responder_spi(header_data,0x122398); @@ -98,10 +97,10 @@ void test_generator_with_header_payload(tester_t *tester) generator = generator_create(); tester->assert_true(tester,(generator != NULL), "generator create check"); - status = generator->generate_payload(generator,(payload_t *)header_data); + generator->generate_payload(generator,(payload_t *)header_data); tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->write_to_chunk(generator,&generated_data); u_int8_t expected_generation2[] = { 0x34,0x12,0x23,0x54, @@ -124,7 +123,7 @@ void test_generator_with_header_payload(tester_t *tester) header_data->destroy(header_data); global_logger_manager->destroy_logger(global_logger_manager,logger); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); } /* @@ -145,9 +144,8 @@ void test_generator_with_transform_attribute(tester_t *tester) generator = generator_create(); tester->assert_true(tester,(generator != NULL), "generator create check"); attribute = transform_attribute_create(); - status = generator->generate_payload(generator,(payload_t *)attribute); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)attribute); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated attribute",&generated_data); u_int8_t expected_generation[] = { @@ -156,7 +154,7 @@ void test_generator_with_transform_attribute(tester_t *tester) tester->assert_true(tester,(memcmp(expected_generation,generated_data.ptr,sizeof(expected_generation)) == 0), "compare generated data"); allocator_free_chunk(&generated_data); tester->assert_true(tester,(attribute->destroy(attribute) == SUCCESS), "attribute destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); /* test attribute with 2 byte data */ generator = generator_create(); @@ -170,9 +168,8 @@ void test_generator_with_transform_attribute(tester_t *tester) attribute->set_value_chunk(attribute,data); - status = generator->generate_payload(generator,(payload_t *)attribute); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)attribute); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated attribute",&generated_data); u_int8_t expected_generation2[] = { @@ -182,7 +179,7 @@ void test_generator_with_transform_attribute(tester_t *tester) allocator_free_chunk(&generated_data); tester->assert_true(tester,(attribute->destroy(attribute) == SUCCESS), "attribute destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); @@ -202,9 +199,8 @@ void test_generator_with_transform_attribute(tester_t *tester) tester->assert_true(tester,(status == SUCCESS),"set_attribute_type call check"); - status = generator->generate_payload(generator,(payload_t *)attribute); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)attribute); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated attribute",&generated_data); u_int8_t expected_generation3[] = { @@ -221,7 +217,7 @@ void test_generator_with_transform_attribute(tester_t *tester) allocator_free_chunk(&generated_data); tester->assert_true(tester,(attribute->destroy(attribute) == SUCCESS), "attribute destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); global_logger_manager->destroy_logger(global_logger_manager,logger); @@ -285,9 +281,8 @@ void test_generator_with_transform_substructure(tester_t *tester) logger->log(logger,CONTROL,"transform created"); - status = generator->generate_payload(generator,(payload_t *)transform); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)transform); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated transform",&generated_data); u_int8_t expected_generation3[] = { @@ -302,7 +297,7 @@ void test_generator_with_transform_substructure(tester_t *tester) allocator_free_chunk(&generated_data); tester->assert_true(tester,(transform->destroy(transform) == SUCCESS), "transform destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); global_logger_manager->destroy_logger(global_logger_manager,logger); @@ -405,9 +400,8 @@ void test_generator_with_proposal_substructure(tester_t *tester) tester->assert_true(tester,(status == SUCCESS),"set_protocol_id call check"); - status = generator->generate_payload(generator,(payload_t *)proposal); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)proposal); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated transform",&generated_data); u_int8_t expected_generation[] = { @@ -438,7 +432,7 @@ void test_generator_with_proposal_substructure(tester_t *tester) allocator_free_chunk(&generated_data); tester->assert_true(tester,(proposal->destroy(proposal) == SUCCESS), "proposal destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); global_logger_manager->destroy_logger(global_logger_manager,logger); @@ -566,11 +560,9 @@ void test_generator_with_sa_payload(tester_t *tester) ike_header->set_response_flag(ike_header, TRUE); ike_header->set_message_id(ike_header,0x33AFF3); - status = generator->generate_payload(generator,(payload_t *)ike_header); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - status = generator->generate_payload(generator,(payload_t *)sa_payload); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)ike_header); + generator->generate_payload(generator,(payload_t *)sa_payload); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated transform",&generated_data); u_int8_t expected_generation[] = { @@ -618,7 +610,7 @@ void test_generator_with_sa_payload(tester_t *tester) allocator_free_chunk(&generated_data); tester->assert_true(tester,(ike_header->destroy(ike_header) == SUCCESS), "ike_header destroy call check"); tester->assert_true(tester,(sa_payload->destroy(sa_payload) == SUCCESS), "sa_payload destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); global_logger_manager->destroy_logger(global_logger_manager,logger); @@ -632,7 +624,6 @@ void test_generator_with_ke_payload(tester_t *tester) generator_t *generator; ke_payload_t *ke_payload; logger_t *logger; - status_t status; chunk_t generated_data; chunk_t key_exchange_data; @@ -652,9 +643,8 @@ void test_generator_with_ke_payload(tester_t *tester) ke_payload->set_dh_group_number(ke_payload,7777); - status = generator->generate_payload(generator,(payload_t *)ke_payload); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)ke_payload); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated payload",&generated_data); u_int8_t expected_generation[] = { @@ -675,7 +665,7 @@ void test_generator_with_ke_payload(tester_t *tester) allocator_free_chunk(&generated_data); tester->assert_true(tester,(ke_payload->destroy(ke_payload) == SUCCESS), "sa_payload destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); global_logger_manager->destroy_logger(global_logger_manager,logger); @@ -689,7 +679,6 @@ void test_generator_with_notify_payload(tester_t *tester) generator_t *generator; notify_payload_t *notify_payload; logger_t *logger; - status_t status; chunk_t generated_data; chunk_t spi,notification_data; @@ -713,9 +702,8 @@ void test_generator_with_notify_payload(tester_t *tester) notify_payload->set_spi(notify_payload,spi); notify_payload->set_notification_data(notify_payload,notification_data); - status = generator->generate_payload(generator,(payload_t *)notify_payload); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)notify_payload); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated payload",&generated_data); u_int8_t expected_generation[] = { @@ -737,7 +725,7 @@ void test_generator_with_notify_payload(tester_t *tester) allocator_free_chunk(&generated_data); tester->assert_true(tester,(notify_payload->destroy(notify_payload) == SUCCESS), "notify_payload destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); global_logger_manager->destroy_logger(global_logger_manager,logger); @@ -751,7 +739,6 @@ void test_generator_with_nonce_payload(tester_t *tester) generator_t *generator; nonce_payload_t *nonce_payload; logger_t *logger; - status_t status; chunk_t generated_data; chunk_t nonce; @@ -769,9 +756,8 @@ void test_generator_with_nonce_payload(tester_t *tester) nonce_payload->set_nonce(nonce_payload,nonce); - status = generator->generate_payload(generator,(payload_t *)nonce_payload); - tester->assert_true(tester,(status == SUCCESS),"generate_payload call check"); - tester->assert_true(tester,(generator->write_to_chunk(generator,&generated_data) == SUCCESS),"write_to_chunk call check"); + generator->generate_payload(generator,(payload_t *)nonce_payload); + generator->write_to_chunk(generator,&generated_data); logger->log_chunk(logger,RAW,"generated payload",&generated_data); @@ -793,7 +779,7 @@ void test_generator_with_nonce_payload(tester_t *tester) tester->assert_true(tester,(nonce_payload->destroy(nonce_payload) == SUCCESS), "notify_payload destroy call check"); - tester->assert_true(tester,(generator->destroy(generator) == SUCCESS), "generator destroy call check"); + generator->destroy(generator); global_logger_manager->destroy_logger(global_logger_manager,logger); |