diff options
Diffstat (limited to 'Source/charon/encoding')
| -rw-r--r-- | Source/charon/encoding/generator.c | 20 | ||||
| -rw-r--r-- | Source/charon/encoding/parser.c | 11 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/Makefile.payloads | 3 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/encodings.c | 2 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/encodings.h | 10 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/payload.c | 3 |
6 files changed, 46 insertions, 3 deletions
diff --git a/Source/charon/encoding/generator.c b/Source/charon/encoding/generator.c index b50e7fffb..1eb286939 100644 --- a/Source/charon/encoding/generator.c +++ b/Source/charon/encoding/generator.c @@ -43,6 +43,7 @@ #include <encoding/payloads/id_payload.h> #include <encoding/payloads/auth_payload.h> #include <encoding/payloads/cert_payload.h> +#include <encoding/payloads/certreq_payload.h> #include <encoding/payloads/ts_payload.h> @@ -744,7 +745,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload) u_int16_t int16_val = htons(length_of_ke_payload); 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 */ @@ -800,17 +801,30 @@ static void generate_payload (private_generator_t *this,payload_t *payload) } case CERT_DATA: { - /* the AUTH Data value is generated from chunk */ + /* the CERT Data value is generated from chunk */ 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 */ + /* Length of PAYLOAD is calculated */ u_int16_t length_of_cert_payload = CERT_PAYLOAD_HEADER_LENGTH + ((chunk_t *)(this->data_struct + rules[i].offset))->len; u_int16_t int16_val = htons(length_of_cert_payload); this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); break; } + case CERTREQ_DATA: + { + /* the CERTREQ Data value is generated from chunk */ + this->generate_from_chunk(this, rules[i].offset); + + u_int32_t payload_length_position_offset = this->last_payload_length_position_offset; + /* Length of PAYLOAD is calculated */ + u_int16_t length_of_certreq_payload = CERTREQ_PAYLOAD_HEADER_LENGTH + ((chunk_t *)(this->data_struct + rules[i].offset))->len; + u_int16_t int16_val = htons(length_of_certreq_payload); + + this->write_bytes_to_buffer_at_offset(this,&int16_val,sizeof(u_int16_t),payload_length_position_offset); + break; + } case PROPOSALS: { /* before iterative generate the transforms, store the current payload length position */ diff --git a/Source/charon/encoding/parser.c b/Source/charon/encoding/parser.c index 1b1c13613..e57bee3f1 100644 --- a/Source/charon/encoding/parser.c +++ b/Source/charon/encoding/parser.c @@ -44,6 +44,7 @@ #include <encoding/payloads/encryption_payload.h> #include <encoding/payloads/auth_payload.h> #include <encoding/payloads/cert_payload.h> +#include <encoding/payloads/certreq_payload.h> #include <encoding/payloads/ts_payload.h> @@ -838,6 +839,16 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ } break; } + case CERTREQ_DATA: + { + size_t data_length = payload_length - CERTREQ_PAYLOAD_HEADER_LENGTH; + if (this->parse_chunk(this, rule_number, output + rule->offset, data_length) != SUCCESS) + { + pld->destroy(pld); + return PARSE_ERROR; + } + break; + } case KEY_EXCHANGE_DATA: { size_t keydata_length = payload_length - KE_PAYLOAD_HEADER_LENGTH; diff --git a/Source/charon/encoding/payloads/Makefile.payloads b/Source/charon/encoding/payloads/Makefile.payloads index 1fe65179e..5ba6b5396 100644 --- a/Source/charon/encoding/payloads/Makefile.payloads +++ b/Source/charon/encoding/payloads/Makefile.payloads @@ -46,6 +46,9 @@ OBJS+= $(BUILD_DIR)cert_payload.o $(BUILD_DIR)cert_payload.o : $(PAYLOADS_DIR)cert_payload.c $(PAYLOADS_DIR)cert_payload.h $(CC) $(CFLAGS) -c -o $@ $< +OBJS+= $(BUILD_DIR)certreq_payload.o +$(BUILD_DIR)certreq_payload.o : $(PAYLOADS_DIR)certreq_payload.c $(PAYLOADS_DIR)certreq_payload.h + $(CC) $(CFLAGS) -c -o $@ $< OBJS+= $(BUILD_DIR)ts_payload.o $(BUILD_DIR)ts_payload.o : $(PAYLOADS_DIR)ts_payload.c $(PAYLOADS_DIR)ts_payload.h $(CC) $(CFLAGS) -c -o $@ $< diff --git a/Source/charon/encoding/payloads/encodings.c b/Source/charon/encoding/payloads/encodings.c index 5d952121f..58887d895 100644 --- a/Source/charon/encoding/payloads/encodings.c +++ b/Source/charon/encoding/payloads/encodings.c @@ -54,5 +54,7 @@ mapping_t encoding_type_m[] = { {TS_TYPE, "TS_TYPE"}, {ADDRESS, "ADDRESS"}, {TRAFFIC_SELECTORS, "TRAFFIC_SELECTORS"}, + {CERT_DATA, "CERT_DATA"}, + {CERTREQ_DATA, "CERTREQ_DATA"}, {MAPPING_END, NULL} }; diff --git a/Source/charon/encoding/payloads/encodings.h b/Source/charon/encoding/payloads/encodings.h index 33610f1e0..fe761042e 100644 --- a/Source/charon/encoding/payloads/encodings.h +++ b/Source/charon/encoding/payloads/encodings.h @@ -379,6 +379,16 @@ enum encoding_type_t{ CERT_DATA, /** + * Representating a CERTREQ Data field. + * + * When generating the content of the chunkt pointing to + * is written. + * + * When parsing (Payload Length - 5) bytes are read and written into the chunk pointing to. + */ + CERTREQ_DATA, + + /** * Representating an IKE_SPI field in an IKEv2 Header. * * When generating the value of the u_int64_t pointing to diff --git a/Source/charon/encoding/payloads/payload.c b/Source/charon/encoding/payloads/payload.c index 7e6499323..bf0134cc8 100644 --- a/Source/charon/encoding/payloads/payload.c +++ b/Source/charon/encoding/payloads/payload.c @@ -32,6 +32,7 @@ #include <encoding/payloads/notify_payload.h> #include <encoding/payloads/auth_payload.h> #include <encoding/payloads/cert_payload.h> +#include <encoding/payloads/certreq_payload.h> #include <encoding/payloads/encryption_payload.h> #include <encoding/payloads/ts_payload.h> @@ -91,6 +92,8 @@ payload_t *payload_create(payload_type_t type) return (payload_t*)auth_payload_create(); case CERTIFICATE: return (payload_t*)cert_payload_create(); + case CERTIFICATE_REQUEST: + return (payload_t*)certreq_payload_create(); case TRAFFIC_SELECTOR_SUBSTRUCTURE: return (payload_t*)traffic_selector_substructure_create(); case TRAFFIC_SELECTOR_INITIATOR: |