diff options
Diffstat (limited to 'src')
54 files changed, 175 insertions, 175 deletions
diff --git a/src/charon/daemon.h b/src/charon/daemon.h index e00a1afba..7fcdc55ce 100644 --- a/src/charon/daemon.h +++ b/src/charon/daemon.h @@ -232,7 +232,7 @@ struct daemon_t { /** * The Sender-Thread. - */ + */ sender_t *sender; /** 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 }, diff --git a/src/charon/network/sender.h b/src/charon/network/sender.h index 0ac775520..f77fadab2 100644 --- a/src/charon/network/sender.h +++ b/src/charon/network/sender.h @@ -39,7 +39,7 @@ struct sender_t { * Whenever the sender thread thinks it's good to send the packet, * it'll do so. * - * @param packet packet to send + * @param packet packet to send */ void (*send) (sender_t *this, packet_t *packet); diff --git a/src/charon/plugins/eap_aka/eap_aka.c b/src/charon/plugins/eap_aka/eap_aka.c index c2c1a50f8..e76778f22 100644 --- a/src/charon/plugins/eap_aka/eap_aka.c +++ b/src/charon/plugins/eap_aka/eap_aka.c @@ -1341,15 +1341,15 @@ static status_t peer_process_notification(private_eap_aka_t *this, DBG1(DBG_IKE, "received AKA notification 'general " "failure' (%d)", code); return FAILED; - case 32768: + case 32768: DBG1(DBG_IKE, "received AKA notification 'successfully " "authenticated' (%d)", code); continue; - case 1026: + case 1026: DBG1(DBG_IKE, "received AKA notification 'access " "temporarily denied' (%d)", code); return FAILED; - case 1031: + case 1031: DBG1(DBG_IKE, "received AKA notification 'not " "subscribed to service' (%d)", code); return FAILED; diff --git a/src/charon/plugins/eap_sim/eap_sim.c b/src/charon/plugins/eap_sim/eap_sim.c index 811febdb3..a4bde05fe 100644 --- a/src/charon/plugins/eap_sim/eap_sim.c +++ b/src/charon/plugins/eap_sim/eap_sim.c @@ -1107,7 +1107,7 @@ eap_sim_t *eap_sim_create_generic(eap_role_t role, identification_t *server, } rng->allocate_bytes(rng, NONCE_LEN, &this->nonce); rng->destroy(rng); - break; + break; default: free(this); return NULL; diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_card.c b/src/charon/plugins/eap_sim_file/eap_sim_file_card.c index 2a854d367..11efd5420 100644 --- a/src/charon/plugins/eap_sim_file/eap_sim_file_card.c +++ b/src/charon/plugins/eap_sim_file/eap_sim_file_card.c @@ -33,8 +33,8 @@ struct private_eap_sim_file_card_t { identification_t *imsi; /** - * source of triplets - */ + * source of triplets + */ eap_sim_file_triplets_t *triplets; }; diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_provider.c b/src/charon/plugins/eap_sim_file/eap_sim_file_provider.c index dc55911b8..3fec47bee 100644 --- a/src/charon/plugins/eap_sim_file/eap_sim_file_provider.c +++ b/src/charon/plugins/eap_sim_file/eap_sim_file_provider.c @@ -28,8 +28,8 @@ struct private_eap_sim_file_provider_t { eap_sim_file_provider_t public; /** - * source of triplets - */ + * source of triplets + */ eap_sim_file_triplets_t *triplets; }; diff --git a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c b/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c index 1b6afe6ce..d68d2dad5 100644 --- a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c +++ b/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c @@ -846,8 +846,8 @@ static void host2ext(host_t *host, struct sadb_address *ext) { sockaddr_t *host_addr = host->get_sockaddr(host); socklen_t *len = host->get_sockaddr_len(host); - memcpy((char*)(ext + 1), host_addr, *len); - ext->sadb_address_len = PFKEY_LEN(sizeof(*ext) + *len); + memcpy((char*)(ext + 1), host_addr, *len); + ext->sadb_address_len = PFKEY_LEN(sizeof(*ext) + *len); } /** @@ -872,7 +872,7 @@ static void add_anyaddr_ext(struct sadb_msg *msg, int family, u_int8_t type) addr->sadb_address_exttype = type; sockaddr_t *saddr = (sockaddr_t*)(addr + 1); saddr->sa_family = family; - addr->sadb_address_len = PFKEY_LEN(sizeof(*addr) + len); + addr->sadb_address_len = PFKEY_LEN(sizeof(*addr) + len); PFKEY_EXT_ADD(msg, addr); } diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c index e4967de69..08d494ecb 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -943,8 +943,8 @@ static status_t add_sa(private_kernel_netlink_ipsec_t *this, { lifetime_cfg_t lft = {{0,0,0},{0,0,0},{0,0,0}}; add_sa(this, src, dst, htonl(ntohs(cpi)), IPPROTO_COMP, reqid, &lft, - ENCR_UNDEFINED, chunk_empty, AUTH_UNDEFINED, chunk_empty, - mode, ipcomp, 0, FALSE, inbound); + ENCR_UNDEFINED, chunk_empty, AUTH_UNDEFINED, chunk_empty, + mode, ipcomp, 0, FALSE, inbound); ipcomp = IPCOMP_NONE; } diff --git a/src/charon/plugins/load_tester/load_tester_config.c b/src/charon/plugins/load_tester/load_tester_config.c index 74a62f667..c7c609f57 100644 --- a/src/charon/plugins/load_tester/load_tester_config.c +++ b/src/charon/plugins/load_tester/load_tester_config.c @@ -50,8 +50,8 @@ struct private_load_tester_config_t { char *pool; /** - * IKE proposal - */ + * IKE proposal + */ proposal_t *proposal; /** diff --git a/src/charon/plugins/nm/nm_creds.c b/src/charon/plugins/nm/nm_creds.c index 1a35105cf..f9b852d27 100644 --- a/src/charon/plugins/nm/nm_creds.c +++ b/src/charon/plugins/nm/nm_creds.c @@ -36,9 +36,9 @@ struct private_nm_creds_t { certificate_t *cert; /** - * User name - */ - identification_t *user; + * User name + */ + identification_t *user; /** * User password diff --git a/src/charon/processing/processor.h b/src/charon/processing/processor.h index 58222ab81..5bf8cf573 100644 --- a/src/charon/processing/processor.h +++ b/src/charon/processing/processor.h @@ -60,7 +60,7 @@ struct processor_t { * * This function is non blocking and adds a job_t to the queue. * - * @param job job to add to the queue + * @param job job to add to the queue */ void (*queue_job) (processor_t *this, job_t *job); diff --git a/src/charon/sa/child_sa.c b/src/charon/sa/child_sa.c index b30a5c0aa..f2ffdab2f 100644 --- a/src/charon/sa/child_sa.c +++ b/src/charon/sa/child_sa.c @@ -128,9 +128,9 @@ struct private_child_sa_t { ipsec_mode_t mode; /** - * selected proposal - */ - proposal_t *proposal; + * selected proposal + */ + proposal_t *proposal; /** * config used to create this child diff --git a/src/charon/sa/connect_manager.c b/src/charon/sa/connect_manager.c index 8df1824ac..2eebe4cfe 100644 --- a/src/charon/sa/connect_manager.c +++ b/src/charon/sa/connect_manager.c @@ -1059,14 +1059,14 @@ static void queue_triggered_check(private_connect_manager_t *this, check_list_t *checklist, endpoint_pair_t *pair) { DBG2(DBG_IKE, "queueing triggered check for pair '%d'", pair->id); - pair->state = CHECK_WAITING; - checklist->triggered->insert_last(checklist->triggered, pair); - - if (!checklist->sender) - { - /* if the sender is not running we restart it */ - schedule_checks(this, checklist, ME_INTERVAL); - } + pair->state = CHECK_WAITING; + checklist->triggered->insert_last(checklist->triggered, pair); + + if (!checklist->sender) + { + /* if the sender is not running we restart it */ + schedule_checks(this, checklist, ME_INTERVAL); + } } /** diff --git a/src/charon/sa/ike_sa_id.h b/src/charon/sa/ike_sa_id.h index 0e7d7ea45..a833aa9d6 100644 --- a/src/charon/sa/ike_sa_id.h +++ b/src/charon/sa/ike_sa_id.h @@ -70,8 +70,8 @@ struct ike_sa_id_t { * * Two ike_sa_id_t objects are equal if both SPI values and the role matches. * - * @param other ike_sa_id_t object to check if equal - * @return TRUE if given ike_sa_id_t are equal, FALSE otherwise + * @param other ike_sa_id_t object to check if equal + * @return TRUE if given ike_sa_id_t are equal, FALSE otherwise */ bool (*equals) (ike_sa_id_t *this, ike_sa_id_t *other); @@ -81,7 +81,7 @@ struct ike_sa_id_t { * * After calling this function, both objects are equal. * - * @param other ike_sa_id_t object from which values will be taken + * @param other ike_sa_id_t object from which values will be taken */ void (*replace_values) (ike_sa_id_t *this, ike_sa_id_t *other); diff --git a/src/charon/sa/keymat.c b/src/charon/sa/keymat.c index e7224fe52..93f88a6fc 100644 --- a/src/charon/sa/keymat.c +++ b/src/charon/sa/keymat.c @@ -31,9 +31,9 @@ struct private_keymat_t { keymat_t public; /** - * IKE_SA Role, initiator or responder - */ - bool initiator; + * IKE_SA Role, initiator or responder + */ + bool initiator; /** * inbound signer (verify) diff --git a/src/dumm/main.c b/src/dumm/main.c index a531700a4..337a1a144 100644 --- a/src/dumm/main.c +++ b/src/dumm/main.c @@ -496,7 +496,7 @@ int main(int argc, char *argv[]) /* Dumm menu */ menu = gtk_menu_new(); - dummMenu = gtk_menu_item_new_with_mnemonic("_Dumm"); + dummMenu = gtk_menu_item_new_with_mnemonic("_Dumm"); gtk_menu_bar_append(GTK_MENU_BAR(menubar), dummMenu); gtk_widget_show(dummMenu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(dummMenu), menu); @@ -510,7 +510,7 @@ int main(int argc, char *argv[]) /* Guest menu */ menu = gtk_menu_new(); - guestMenu = gtk_menu_item_new_with_mnemonic("_Guest"); + guestMenu = gtk_menu_item_new_with_mnemonic("_Guest"); gtk_menu_bar_append(GTK_MENU_BAR(menubar), guestMenu); gtk_widget_show(guestMenu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(guestMenu), menu); @@ -575,7 +575,7 @@ int main(int argc, char *argv[]) /* Switch menu */ menu = gtk_menu_new(); - switchMenu = gtk_menu_item_new_with_mnemonic("_Switch"); + switchMenu = gtk_menu_item_new_with_mnemonic("_Switch"); gtk_menu_bar_append(GTK_MENU_BAR(menubar), switchMenu); gtk_widget_show(switchMenu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(switchMenu), menu); @@ -595,7 +595,7 @@ int main(int argc, char *argv[]) gtk_widget_set_sensitive(menuitem, FALSE); gtk_widget_show(menuitem); - /* show widgets */ + /* show widgets */ gtk_widget_show(menubar); gtk_widget_show(notebook); gtk_widget_show(vbox); diff --git a/src/include/linux/netlink.h b/src/include/linux/netlink.h index 811a3c42c..1aeee628b 100644 --- a/src/include/linux/netlink.h +++ b/src/include/linux/netlink.h @@ -29,7 +29,7 @@ struct sockaddr_nl sa_family_t nl_family; /* AF_NETLINK */ unsigned short nl_pad; /* zero */ __u32 nl_pid; /* process pid */ - __u32 nl_groups; /* multicast groups mask */ + __u32 nl_groups; /* multicast groups mask */ }; struct nlmsghdr diff --git a/src/include/linux/rtnetlink.h b/src/include/linux/rtnetlink.h index 93201a4fb..131822c0f 100644 --- a/src/include/linux/rtnetlink.h +++ b/src/include/linux/rtnetlink.h @@ -941,7 +941,7 @@ extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const voi #define RTA_PUT(skb, attrtype, attrlen, data) \ ({ if (unlikely(skb_tailroom(skb) < (int)RTA_SPACE(attrlen))) \ goto rtattr_failure; \ - __rta_fill(skb, attrtype, attrlen, data); }) + __rta_fill(skb, attrtype, attrlen, data); }) #define RTA_APPEND(skb, attrlen, data) \ ({ if (unlikely(skb_tailroom(skb) < (int)(attrlen))) \ @@ -1038,7 +1038,7 @@ __rta_reserve(struct sk_buff *skb, int attrtype, int attrlen) #define __RTA_PUT(skb, attrtype, attrlen) \ ({ if (unlikely(skb_tailroom(skb) < (int)RTA_SPACE(attrlen))) \ goto rtattr_failure; \ - __rta_reserve(skb, attrtype, attrlen); }) + __rta_reserve(skb, attrtype, attrlen); }) extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change); diff --git a/src/include/linux/udp.h b/src/include/linux/udp.h index 2ee121bd0..c213d2a51 100644 --- a/src/include/linux/udp.h +++ b/src/include/linux/udp.h @@ -45,7 +45,7 @@ struct udp_sock { struct inet_sock inet; int pending; /* Any pending frames ? */ unsigned int corkflag; /* Cork is required */ - __u16 encap_type; /* Is this an Encapsulation socket? */ + __u16 encap_type; /* Is this an Encapsulation socket? */ /* * Following member retains the infomation to create a UDP header * when the socket is uncorked. diff --git a/src/libfast/dispatcher.h b/src/libfast/dispatcher.h index 17a288b8f..93c6026c6 100644 --- a/src/libfast/dispatcher.h +++ b/src/libfast/dispatcher.h @@ -39,9 +39,9 @@ dispatcher_t *dispatcher; your_global_context_implementation_t *global; - global = initialize_your_global_context(); + global = initialize_your_global_context(); - dispatcher = dispatcher_create(NULL, FALSE, 180, + dispatcher = dispatcher_create(NULL, FALSE, 180, (context_constructor_t)your_session_context_create, global); dispatcher->add_controller(dispatcher, your_controller1_create, param1); dispatcher->add_controller(dispatcher, your_controller2_create, param2); diff --git a/src/libfreeswan/addrtot.c b/src/libfreeswan/addrtot.c index b4b853bbb..d1a338730 100644 --- a/src/libfreeswan/addrtot.c +++ b/src/libfreeswan/addrtot.c @@ -251,7 +251,7 @@ struct rtab { {"1:2::3:4", 'Q', "1:2:0:0:0:0:3:4"}, {"1:2:0:0:3:4:0:0", 0, "1:2::3:4:0:0"}, {"1.2.3.4", 'r' , "4.3.2.1.IN-ADDR.ARPA."}, - /* 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f */ + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f */ {"1:2::3:4", 'r', "4.0.0.0.3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.1.0.0.0.IP6.ARPA."}, {NULL, 0, NULL} }; diff --git a/src/libstrongswan/crypto/pkcs9.c b/src/libstrongswan/crypto/pkcs9.c index cb99ccd85..4b659cf64 100644 --- a/src/libstrongswan/crypto/pkcs9.c +++ b/src/libstrongswan/crypto/pkcs9.c @@ -250,7 +250,7 @@ static void build_encoding(private_pkcs9_t *this) { memcpy(pos, attribute->encoding.ptr, attribute->encoding.len); pos += attribute->encoding.len; - } + } iterator->destroy(iterator); } } diff --git a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c index 0b3e7e2e8..2d82a3de2 100644 --- a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c +++ b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c @@ -314,7 +314,7 @@ static bool encrypt_(private_gmp_rsa_public_key_t *this, chunk_t plain, chunk_t em; u_char *pos; int padding, i; - rng_t *rng; + rng_t *rng; rng = lib->crypto->create_rng(lib->crypto, RNG_WEAK); if (rng == NULL) @@ -325,7 +325,7 @@ static bool encrypt_(private_gmp_rsa_public_key_t *this, chunk_t plain, /* number of pseudo-random padding octets */ padding = this->k - plain.len - 3; - if (padding < MIN_PS_PADDING) + if (padding < MIN_PS_PADDING) { DBG1("pseudo-random padding must be at least %d octets", MIN_PS_PADDING); return FALSE; diff --git a/src/libstrongswan/plugins/md4/md4_hasher.c b/src/libstrongswan/plugins/md4/md4_hasher.c index 13291101b..366d37328 100644 --- a/src/libstrongswan/plugins/md4/md4_hasher.c +++ b/src/libstrongswan/plugins/md4/md4_hasher.c @@ -119,7 +119,7 @@ static void Decode(u_int32_t *output, u_int8_t *input, size_t len) for (i = 0, j = 0; j < len; i++, j += 4) { - output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) | + output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) | (((u_int32_t)input[j+2]) << 16) | (((u_int32_t)input[j+3]) << 24); } } diff --git a/src/libstrongswan/plugins/md5/md5_hasher.c b/src/libstrongswan/plugins/md5/md5_hasher.c index c581e046b..a97ad5cae 100644 --- a/src/libstrongswan/plugins/md5/md5_hasher.c +++ b/src/libstrongswan/plugins/md5/md5_hasher.c @@ -135,7 +135,7 @@ static void Decode(u_int32_t *output, u_int8_t *input, size_t len) for (i = 0, j = 0; j < len; i++, j += 4) { - output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) | + output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) | (((u_int32_t)input[j+2]) << 16) | (((u_int32_t)input[j+3]) << 24); } } diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index 38230ef17..1cc6f7ce6 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -131,7 +131,7 @@ static void threading_init() int i, num_locks; CRYPTO_set_id_callback(id_function); - CRYPTO_set_locking_callback(locking_function); + CRYPTO_set_locking_callback(locking_function); CRYPTO_set_dynlock_create_callback(create_function); CRYPTO_set_dynlock_lock_callback(lock_function); diff --git a/src/libstrongswan/plugins/x509/ietf_attr_list.c b/src/libstrongswan/plugins/x509/ietf_attr_list.c index b32f4c5d0..d1ba7266e 100644 --- a/src/libstrongswan/plugins/x509/ietf_attr_list.c +++ b/src/libstrongswan/plugins/x509/ietf_attr_list.c @@ -189,7 +189,7 @@ bool ietfAttr_list_equals(linked_list_t *list_a, linked_list_t *list_b) result = FALSE; break; } - } + } iterator_a->destroy(iterator_a); iterator_b->destroy(iterator_b); } @@ -238,7 +238,7 @@ void ietfAttr_list_list(linked_list_t *list, FILE *out) break; default: break; - } + } } iterator->destroy(iterator); } diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index 6a3f74140..b502c028a 100644 --- a/src/libstrongswan/settings.c +++ b/src/libstrongswan/settings.c @@ -77,8 +77,8 @@ struct section_t { struct kv_t { /** - * key string, relative - */ + * key string, relative + */ char *key; /** diff --git a/src/libstrongswan/settings.h b/src/libstrongswan/settings.h index f483c3d26..e10158f0b 100644 --- a/src/libstrongswan/settings.h +++ b/src/libstrongswan/settings.h @@ -37,17 +37,17 @@ typedef struct settings_t settings_t; * * E.g.: * @code - a = b - section-one { - somevalue = asdf - subsection { - othervalue = xxx - } - yetanother = zz - } - section-two { - } - @endcode + a = b + section-one { + somevalue = asdf + subsection { + othervalue = xxx + } + yetanother = zz + } + section-two { + } + @endcode * * The values are accesses using the get() functions using dotted keys, e.g. * section-one.subsection.othervalue diff --git a/src/pluto/constants.h b/src/pluto/constants.h index b20737b73..81990cb37 100644 --- a/src/pluto/constants.h +++ b/src/pluto/constants.h @@ -692,7 +692,7 @@ typedef enum certpolicy { CERT_SEND_IF_ASKED = 1, CERT_NEVER_SEND = 2, - CERT_YES_SEND = 3, /* synonym for CERT_ALWAYS_SEND */ + CERT_YES_SEND = 3, /* synonym for CERT_ALWAYS_SEND */ CERT_NO_SEND = 4 /* synonym for CERT_NEVER_SEND */ } certpolicy_t; diff --git a/src/pluto/crypto.c b/src/pluto/crypto.c index c6d3950bb..85568f67f 100644 --- a/src/pluto/crypto.c +++ b/src/pluto/crypto.c @@ -491,7 +491,7 @@ int oakley_from_encryption_algorithm(encryption_algorithm_t alg) return OAKLEY_CAMELLIA_CBC; case ENCR_SERPENT_CBC: return OAKLEY_SERPENT_CBC; - case ENCR_TWOFISH_CBC: + case ENCR_TWOFISH_CBC: return OAKLEY_TWOFISH_CBC; default: return 0; @@ -561,7 +561,7 @@ int esp_from_encryption_algorithm(encryption_algorithm_t alg) return ESP_CAMELLIA; case ENCR_SERPENT_CBC: return ESP_SERPENT; - case ENCR_TWOFISH_CBC: + case ENCR_TWOFISH_CBC: return ESP_TWOFISH; default: return 0; diff --git a/src/pluto/demux.c b/src/pluto/demux.c index 73582dd92..b41c816e5 100644 --- a/src/pluto/demux.c +++ b/src/pluto/demux.c @@ -1827,7 +1827,7 @@ process_packet(struct msg_digest **mdp) crypter->decrypt(crypter, data, iv, NULL); crypter->destroy(crypter); - memcpy(st->st_new_iv, new_iv, crypter_block_size); + memcpy(st->st_new_iv, new_iv, crypter_block_size); if (restore_iv) { memcpy(st->st_new_iv, new_iv, new_iv_len); diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c index 378955c06..49225a68c 100644 --- a/src/pluto/ocsp.c +++ b/src/pluto/ocsp.c @@ -318,7 +318,7 @@ static bool build_ocsp_location(const x509cert_t *cert, ocsp_location_t *locatio { return FALSE; } - hasher->get_hash(hasher, cert->issuer, digest); + hasher->get_hash(hasher, cert->issuer, digest); hasher->destroy(hasher); location->next = NULL; @@ -756,7 +756,7 @@ static chunk_t sc_build_sha1_signature(chunk_t tbs, smartcard_t *sc) { return chunk_empty; } - hasher->get_hash(hasher, tbs, digest_buf); + hasher->get_hash(hasher, tbs, digest_buf); hasher->destroy(hasher); /* according to PKCS#1 v2.1 digest must be packaged into diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c index 808e5f042..0de8d4d5d 100644 --- a/src/pluto/plutomain.c +++ b/src/pluto/plutomain.c @@ -129,7 +129,7 @@ static void usage(const char *mess) " [--debug-private]" " [--debug-natt]" #endif - " \\\n\t" + " \\\n\t" "[--nat_traversal] [--keep_alive <delay_sec>]" " \\\n\t" "[--force_keepalive] [--disable_port_floating]" diff --git a/src/pluto/x509.h b/src/pluto/x509.h index 7bad35257..6c1b4a6ca 100644 --- a/src/pluto/x509.h +++ b/src/pluto/x509.h @@ -64,7 +64,7 @@ struct x509cert { chunk_t serialNumber; /* signature */ int sigAlg; - chunk_t issuer; + chunk_t issuer; /* validity */ time_t notBefore; time_t notAfter; diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c index e325f3f84..7a9e1ff48 100644 --- a/src/scepclient/scepclient.c +++ b/src/scepclient/scepclient.c @@ -801,7 +801,7 @@ int main(int argc, char **argv) { private_key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, BUILD_KEY_SIZE, rsa_keylength, - BUILD_END); + BUILD_END); } if (private_key == NULL) { |