aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon/encoding
diff options
context:
space:
mode:
Diffstat (limited to 'src/charon/encoding')
-rw-r--r--src/charon/encoding/payloads/auth_payload.c6
-rw-r--r--src/charon/encoding/payloads/cert_payload.c6
-rw-r--r--src/charon/encoding/payloads/cp_payload.c4
-rw-r--r--src/charon/encoding/payloads/delete_payload.c4
-rw-r--r--src/charon/encoding/payloads/eap_payload.c4
-rw-r--r--src/charon/encoding/payloads/encodings.h80
-rw-r--r--src/charon/encoding/payloads/id_payload.c6
-rw-r--r--src/charon/encoding/payloads/ike_header.c20
-rw-r--r--src/charon/encoding/payloads/ke_payload.c4
-rw-r--r--src/charon/encoding/payloads/nonce_payload.c4
-rw-r--r--src/charon/encoding/payloads/notify_payload.c4
-rw-r--r--src/charon/encoding/payloads/proposal_substructure.c20
-rw-r--r--src/charon/encoding/payloads/sa_payload.c4
-rw-r--r--src/charon/encoding/payloads/traffic_selector_substructure.c8
-rw-r--r--src/charon/encoding/payloads/transform_substructure.c4
-rw-r--r--src/charon/encoding/payloads/ts_payload.c6
-rw-r--r--src/charon/encoding/payloads/unknown_payload.c4
-rw-r--r--src/charon/encoding/payloads/vendor_id_payload.c4
18 files changed, 96 insertions, 96 deletions
diff --git a/src/charon/encoding/payloads/auth_payload.c b/src/charon/encoding/payloads/auth_payload.c
index 308af9bda..d31208abb 100644
--- a/src/charon/encoding/payloads/auth_payload.c
+++ b/src/charon/encoding/payloads/auth_payload.c
@@ -65,11 +65,11 @@ struct private_auth_payload_t {
* private_auth_payload_t.
*/
encoding_rule_t auth_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_auth_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_auth_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
@@ -79,7 +79,7 @@ encoding_rule_t auth_payload_encodings[] = {
{ RESERVED_BIT, 0 },
/* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_auth_payload_t, payload_length)},
- /* 1 Byte AUTH type*/
+ /* 1 Byte AUTH type*/
{ U_INT_8, offsetof(private_auth_payload_t, auth_method) },
/* 3 reserved bytes */
{ RESERVED_BYTE, 0 },
diff --git a/src/charon/encoding/payloads/cert_payload.c b/src/charon/encoding/payloads/cert_payload.c
index 36a3bfb6b..3ca546ff6 100644
--- a/src/charon/encoding/payloads/cert_payload.c
+++ b/src/charon/encoding/payloads/cert_payload.c
@@ -90,11 +90,11 @@ struct private_cert_payload_t {
*
*/
encoding_rule_t cert_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_cert_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_cert_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
@@ -104,7 +104,7 @@ encoding_rule_t cert_payload_encodings[] = {
{ RESERVED_BIT, 0 },
/* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_cert_payload_t, payload_length)},
- /* 1 Byte CERT type*/
+ /* 1 Byte CERT type*/
{ U_INT_8, offsetof(private_cert_payload_t, encoding) },
/* some cert data bytes, length is defined in PAYLOAD_LENGTH */
{ CERT_DATA, offsetof(private_cert_payload_t, data) }
diff --git a/src/charon/encoding/payloads/cp_payload.c b/src/charon/encoding/payloads/cp_payload.c
index 6086ad102..8dc4b69f2 100644
--- a/src/charon/encoding/payloads/cp_payload.c
+++ b/src/charon/encoding/payloads/cp_payload.c
@@ -74,11 +74,11 @@ struct private_cp_payload_t {
*
*/
encoding_rule_t cp_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_cp_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_cp_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/delete_payload.c b/src/charon/encoding/payloads/delete_payload.c
index c4fa0f8ae..97b4743b2 100644
--- a/src/charon/encoding/payloads/delete_payload.c
+++ b/src/charon/encoding/payloads/delete_payload.c
@@ -80,11 +80,11 @@ struct private_delete_payload_t {
*
*/
encoding_rule_t delete_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_delete_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_delete_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/eap_payload.c b/src/charon/encoding/payloads/eap_payload.c
index 562faa221..0605d6190 100644
--- a/src/charon/encoding/payloads/eap_payload.c
+++ b/src/charon/encoding/payloads/eap_payload.c
@@ -61,11 +61,11 @@ struct private_eap_payload_t {
*
*/
encoding_rule_t eap_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_eap_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_eap_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/encodings.h b/src/charon/encoding/payloads/encodings.h
index 23389481c..52af4a984 100644
--- a/src/charon/encoding/payloads/encodings.h
+++ b/src/charon/encoding/payloads/encodings.h
@@ -75,7 +75,7 @@ enum encoding_type_t {
*
* When generating it must be changed from host to network order.
* The value is read from the associated data struct.
- * The current write position is moved 16 bit forward afterwards.
+ * The current write position is moved 16 bit forward afterwards.
*
* When parsing it must be changed from network to host order.
* The value is written to the associated data struct.
@@ -140,7 +140,7 @@ enum encoding_type_t {
/**
* Representating a length field of a payload.
*
- * When generating it must be changed from host to network order.
+ * When generating it must be changed from host to network order.
* The value is read from the associated data struct.
* The current write position is moved 16 bit forward afterwards.
*
@@ -153,7 +153,7 @@ enum encoding_type_t {
/**
* Representating a length field of a header.
*
- * When generating it must be changed from host to network order.
+ * When generating it must be changed from host to network order.
* The value is read from the associated data struct.
* The current write position is moved 32 bit forward afterwards.
*
@@ -166,7 +166,7 @@ enum encoding_type_t {
/**
* Representating a spi size field.
*
- * When generating it must be changed from host to network order.
+ * When generating it must be changed from host to network order.
* The value is read from the associated data struct.
* The current write position is moved 8 bit forward afterwards.
*
@@ -179,8 +179,8 @@ enum encoding_type_t {
/**
* Representating a spi field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing SPI_SIZE bytes are read and written into the chunk pointing to.
*/
@@ -189,8 +189,8 @@ enum encoding_type_t {
/**
* Representating a Key Exchange Data field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 8) bytes are read and written into the chunk pointing to.
*/
@@ -199,8 +199,8 @@ enum encoding_type_t {
/**
* Representating a Notification field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - spi size - 8) bytes are read and written into the chunk pointing to.
*/
@@ -260,8 +260,8 @@ enum encoding_type_t {
/**
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 4) bytes are read and written into the chunk pointing to.
*/
@@ -286,7 +286,7 @@ enum encoding_type_t {
*
* When generating it must be changed from host to network order.
* The value is read from the associated data struct.
- * The current write position is moved 15 bit forward afterwards.
+ * The current write position is moved 15 bit forward afterwards.
*
* When parsing it must be changed from network to host order.
* The value is written to the associated data struct.
@@ -301,7 +301,7 @@ enum encoding_type_t {
*
* When generating it must be changed from host to network order.
* The value is read from the associated data struct.
- * The current write position is moved 16 bit forward afterwards.
+ * The current write position is moved 16 bit forward afterwards.
*
* When parsing it must be changed from network to host order.
* The value is written to the associated data struct.
@@ -315,7 +315,7 @@ enum encoding_type_t {
*
* When generating it must be changed from host to network order.
* The value is read from the associated data struct.
- * The current write position is moved 16 bit forward afterwards.
+ * The current write position is moved 16 bit forward afterwards.
*
* When parsing it must be changed from network to host order.
* The value is written to the associated data struct.
@@ -328,8 +328,8 @@ enum encoding_type_t {
* this field is available or missing and so parsed/generated
* or not parsed/not generated.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing SPI_SIZE bytes are read and written into the chunk pointing to.
*/
@@ -353,7 +353,7 @@ enum encoding_type_t {
*
* When generating it must be changed from host to network order.
* The value is read from the associated data struct.
- * The current write position is moved 16 bit forward afterwards.
+ * The current write position is moved 16 bit forward afterwards.
*
* When parsing it must be changed from network to host order.
* The value is written to the associated data struct.
@@ -367,8 +367,8 @@ enum encoding_type_t {
* Depending on the last field of type TS_TYPE
* this field is either 4 or 16 byte long.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing 4 or 16 bytes are read and written into the chunk pointing to.
*/
@@ -377,8 +377,8 @@ enum encoding_type_t {
/**
* Representating a Nonce Data field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 4) bytes are read and written into the chunk pointing to.
*/
@@ -387,8 +387,8 @@ enum encoding_type_t {
/**
* Representating a ID Data field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 8) bytes are read and written into the chunk pointing to.
*/
@@ -397,8 +397,8 @@ enum encoding_type_t {
/**
* Representating a AUTH Data field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 8) bytes are read and written into the chunk pointing to.
*/
@@ -407,8 +407,8 @@ enum encoding_type_t {
/**
* Representating a CERT Data field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * 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.
*/
@@ -417,8 +417,8 @@ enum encoding_type_t {
/**
* Representating a CERTREQ Data field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * 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.
*/
@@ -427,8 +427,8 @@ enum encoding_type_t {
/**
* Representating an EAP message field.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 4) bytes are read and written into the chunk pointing to.
*/
@@ -437,8 +437,8 @@ enum encoding_type_t {
/**
* Representating the SPIS field in a DELETE payload.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 8) bytes are read and written into the chunk pointing to.
*/
@@ -447,8 +447,8 @@ enum encoding_type_t {
/**
* Representating the VID DATA field in a VENDOR ID payload.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 4) bytes are read and written into the chunk pointing to.
*/
@@ -457,8 +457,8 @@ enum encoding_type_t {
/**
* Representating the DATA of an unknown payload.
*
- * When generating the content of the chunkt pointing to
- * is written.
+ * When generating the content of the chunkt pointing to
+ * is written.
*
* When parsing (Payload Length - 4) bytes are read and written into the chunk pointing to.
*/
@@ -467,8 +467,8 @@ enum encoding_type_t {
/**
* Representating an IKE_SPI field in an IKEv2 Header.
*
- * When generating the value of the u_int64_t pointing to
- * is written (host and networ order is not changed).
+ * When generating the value of the u_int64_t pointing to
+ * is written (host and networ order is not changed).
*
* When parsing 8 bytes are read and written into the u_int64_t pointing to.
*/
diff --git a/src/charon/encoding/payloads/id_payload.c b/src/charon/encoding/payloads/id_payload.c
index 39c4a8a33..4158c3e07 100644
--- a/src/charon/encoding/payloads/id_payload.c
+++ b/src/charon/encoding/payloads/id_payload.c
@@ -74,11 +74,11 @@ struct private_id_payload_t {
*
*/
encoding_rule_t id_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_id_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_id_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
@@ -88,7 +88,7 @@ encoding_rule_t id_payload_encodings[] = {
{ RESERVED_BIT, 0 },
/* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_id_payload_t, payload_length) },
- /* 1 Byte ID type*/
+ /* 1 Byte ID type*/
{ U_INT_8, offsetof(private_id_payload_t, id_type) },
/* 3 reserved bytes */
{ RESERVED_BYTE, 0 },
diff --git a/src/charon/encoding/payloads/ike_header.c b/src/charon/encoding/payloads/ike_header.c
index 0ce1ca6b2..735f01304 100644
--- a/src/charon/encoding/payloads/ike_header.c
+++ b/src/charon/encoding/payloads/ike_header.c
@@ -116,32 +116,32 @@ ENUM_END(exchange_type_names, INFORMATIONAL);
* ike_header_t.
*/
encoding_rule_t ike_header_encodings[] = {
- /* 8 Byte SPI, stored in the field initiator_spi */
+ /* 8 Byte SPI, stored in the field initiator_spi */
{ IKE_SPI, offsetof(private_ike_header_t, initiator_spi) },
- /* 8 Byte SPI, stored in the field responder_spi */
+ /* 8 Byte SPI, stored in the field responder_spi */
{ IKE_SPI, offsetof(private_ike_header_t, responder_spi) },
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_ike_header_t, next_payload) },
- /* 4 Bit major version, stored in the field maj_version */
+ /* 4 Bit major version, stored in the field maj_version */
{ U_INT_4, offsetof(private_ike_header_t, maj_version) },
- /* 4 Bit minor version, stored in the field min_version */
+ /* 4 Bit minor version, stored in the field min_version */
{ U_INT_4, offsetof(private_ike_header_t, min_version) },
/* 8 Bit for the exchange type */
{ U_INT_8, offsetof(private_ike_header_t, exchange_type) },
- /* 2 Bit reserved bits, nowhere stored */
+ /* 2 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
- /* 3 Bit flags, stored in the fields response, version and initiator */
+ /* 3 Bit flags, stored in the fields response, version and initiator */
{ FLAG, offsetof(private_ike_header_t, flags.response) },
{ FLAG, offsetof(private_ike_header_t, flags.version) },
{ FLAG, offsetof(private_ike_header_t, flags.initiator) },
- /* 3 Bit reserved bits, nowhere stored */
+ /* 3 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
- /* 4 Byte message id, stored in the field message_id */
+ /* 4 Byte message id, stored in the field message_id */
{ U_INT_32, offsetof(private_ike_header_t, message_id) },
- /* 4 Byte length fied, stored in the field length */
+ /* 4 Byte length fied, stored in the field length */
{ HEADER_LENGTH, offsetof(private_ike_header_t, length) }
};
diff --git a/src/charon/encoding/payloads/ke_payload.c b/src/charon/encoding/payloads/ke_payload.c
index 343a50d2c..1bc79f084 100644
--- a/src/charon/encoding/payloads/ke_payload.c
+++ b/src/charon/encoding/payloads/ke_payload.c
@@ -67,11 +67,11 @@ struct private_ke_payload_t {
*
*/
encoding_rule_t ke_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_ke_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_ke_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/nonce_payload.c b/src/charon/encoding/payloads/nonce_payload.c
index 3de889ec3..4ad5ce9dd 100644
--- a/src/charon/encoding/payloads/nonce_payload.c
+++ b/src/charon/encoding/payloads/nonce_payload.c
@@ -63,11 +63,11 @@ struct private_nonce_payload_t {
*
*/
encoding_rule_t nonce_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_nonce_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_nonce_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/notify_payload.c b/src/charon/encoding/payloads/notify_payload.c
index a8211b957..bd244264c 100644
--- a/src/charon/encoding/payloads/notify_payload.c
+++ b/src/charon/encoding/payloads/notify_payload.c
@@ -217,11 +217,11 @@ struct private_notify_payload_t {
*
*/
encoding_rule_t notify_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_notify_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_notify_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/proposal_substructure.c b/src/charon/encoding/payloads/proposal_substructure.c
index 15630e7ed..c93f73a68 100644
--- a/src/charon/encoding/payloads/proposal_substructure.c
+++ b/src/charon/encoding/payloads/proposal_substructure.c
@@ -66,21 +66,21 @@ struct private_proposal_substructure_t {
/**
* SPI size of the following SPI.
*/
- u_int8_t spi_size;
+ u_int8_t spi_size;
/**
* Number of transforms.
*/
- u_int8_t transforms_count;
+ u_int8_t transforms_count;
- /**
- * SPI is stored as chunk.
- */
- chunk_t spi;
+ /**
+ * SPI is stored as chunk.
+ */
+ chunk_t spi;
- /**
- * Transforms are stored in a linked_list_t.
- */
+ /**
+ * Transforms are stored in a linked_list_t.
+ */
linked_list_t * transforms;
};
@@ -91,7 +91,7 @@ struct private_proposal_substructure_t {
* private_proposal_substructure_t.
*/
encoding_rule_t proposal_substructure_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_proposal_substructure_t, next_payload) },
/* Reserved Byte is skipped */
{ RESERVED_BYTE, 0 },
diff --git a/src/charon/encoding/payloads/sa_payload.c b/src/charon/encoding/payloads/sa_payload.c
index 6a9aac645..187a8fee0 100644
--- a/src/charon/encoding/payloads/sa_payload.c
+++ b/src/charon/encoding/payloads/sa_payload.c
@@ -64,11 +64,11 @@ struct private_sa_payload_t {
*
*/
encoding_rule_t sa_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_sa_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_sa_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/traffic_selector_substructure.c b/src/charon/encoding/payloads/traffic_selector_substructure.c
index a034adee2..f24857591 100644
--- a/src/charon/encoding/payloads/traffic_selector_substructure.c
+++ b/src/charon/encoding/payloads/traffic_selector_substructure.c
@@ -76,15 +76,15 @@ struct private_traffic_selector_substructure_t {
*
*/
encoding_rule_t traffic_selector_substructure_encodings[] = {
- /* 1 Byte next ts type*/
+ /* 1 Byte next ts type*/
{ TS_TYPE, offsetof(private_traffic_selector_substructure_t, ts_type) },
- /* 1 Byte IP protocol id*/
+ /* 1 Byte IP protocol id*/
{ U_INT_8, offsetof(private_traffic_selector_substructure_t, ip_protocol_id) },
/* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_traffic_selector_substructure_t, payload_length) },
- /* 2 Byte start port*/
+ /* 2 Byte start port*/
{ U_INT_16, offsetof(private_traffic_selector_substructure_t, start_port) },
- /* 2 Byte end port*/
+ /* 2 Byte end port*/
{ U_INT_16, offsetof(private_traffic_selector_substructure_t, end_port) },
/* starting address is either 4 or 16 byte */
{ ADDRESS, offsetof(private_traffic_selector_substructure_t, starting_address) },
diff --git a/src/charon/encoding/payloads/transform_substructure.c b/src/charon/encoding/payloads/transform_substructure.c
index 16156b7c6..c94f6c1a2 100644
--- a/src/charon/encoding/payloads/transform_substructure.c
+++ b/src/charon/encoding/payloads/transform_substructure.c
@@ -59,7 +59,7 @@ struct private_transform_substructure_t {
*/
u_int16_t transform_id;
- /**
+ /**
* Transforms Attributes are stored in a linked_list_t.
*/
linked_list_t *attributes;
@@ -74,7 +74,7 @@ struct private_transform_substructure_t {
*
*/
encoding_rule_t transform_substructure_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_transform_substructure_t, next_payload) },
/* Reserved Byte is skipped */
{ RESERVED_BYTE, 0 },
diff --git a/src/charon/encoding/payloads/ts_payload.c b/src/charon/encoding/payloads/ts_payload.c
index 648919137..6bf3e4293 100644
--- a/src/charon/encoding/payloads/ts_payload.c
+++ b/src/charon/encoding/payloads/ts_payload.c
@@ -72,11 +72,11 @@ struct private_ts_payload_t {
*
*/
encoding_rule_t ts_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_ts_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_ts_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
@@ -86,7 +86,7 @@ encoding_rule_t ts_payload_encodings[] = {
{ RESERVED_BIT, 0 },
/* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_ts_payload_t, payload_length)},
- /* 1 Byte TS type*/
+ /* 1 Byte TS type*/
{ U_INT_8, offsetof(private_ts_payload_t, number_of_traffic_selectors) },
/* 3 reserved bytes */
{ RESERVED_BYTE, 0 },
diff --git a/src/charon/encoding/payloads/unknown_payload.c b/src/charon/encoding/payloads/unknown_payload.c
index 3c31ab1a2..dd5547dc3 100644
--- a/src/charon/encoding/payloads/unknown_payload.c
+++ b/src/charon/encoding/payloads/unknown_payload.c
@@ -61,11 +61,11 @@ struct private_unknown_payload_t {
*
*/
encoding_rule_t unknown_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_unknown_payload_t, next_payload)},
/* the critical bit */
{ FLAG, offsetof(private_unknown_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
diff --git a/src/charon/encoding/payloads/vendor_id_payload.c b/src/charon/encoding/payloads/vendor_id_payload.c
index dc16763e0..27764b6c8 100644
--- a/src/charon/encoding/payloads/vendor_id_payload.c
+++ b/src/charon/encoding/payloads/vendor_id_payload.c
@@ -60,11 +60,11 @@ struct private_vendor_id_payload_t {
*
*/
encoding_rule_t vendor_id_payload_encodings[] = {
- /* 1 Byte next payload type, stored in the field next_payload */
+ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_vendor_id_payload_t, next_payload) },
/* the critical bit */
{ FLAG, offsetof(private_vendor_id_payload_t, critical) },
- /* 7 Bit reserved bits, nowhere stored */
+ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 },