diff options
62 files changed, 147 insertions, 145 deletions
diff --git a/src/Makefile.program b/src/Makefile.program index 6868c258a..bfb01e544 100644 --- a/src/Makefile.program +++ b/src/Makefile.program @@ -4,15 +4,9 @@ include ${FREESWANSRCDIR}/Makefile.ver CFLAGS+=$(USERCOMPILE) -I${KLIPSINC} CFLAGS+= -Wall -#CFLAGS+= -Wconversion -#CFLAGS+= -Wmissing-prototypes CFLAGS+= -Wpointer-arith CFLAGS+= -Wcast-qual -#CFLAGS+= -Wmissing-declarations CFLAGS+= -Wstrict-prototypes -#CFLAGS+= -pedantic -#CFLAGS+= -W -#CFLAGS+= -Wwrite-strings CFLAGS+= -Wbad-function-cast # die if there are any warnings diff --git a/src/charon/Makefile b/src/charon/Makefile index b69438b84..722d5d33e 100644 --- a/src/charon/Makefile +++ b/src/charon/Makefile @@ -35,7 +35,7 @@ BINNAMELIB= $(BUILD_DIR)libstrongswan.so MAIN_DIR= ./ -CFLAGS= -Icharon -Ilib -Istroke -fPIC -Wall -g +CFLAGS= -Icharon -Ilib -Istroke -fPIC -Wall -Wcast-qual -Wstrict-prototypes -Wbad-function-cast -g ifeq ($(USE_LEAK_DETECTIVE),true) CFLAGS+= -DLEAK_DETECTIVE endif diff --git a/src/charon/charon/config/configuration.h b/src/charon/charon/config/configuration.h index 6b741f9fb..3696215f0 100755 --- a/src/charon/charon/config/configuration.h +++ b/src/charon/charon/config/configuration.h @@ -84,6 +84,6 @@ struct configuration_t { * * @ingroup config */ -configuration_t *configuration_create(); +configuration_t *configuration_create(void); #endif /*CONFIGURATION_H_*/ diff --git a/src/charon/charon/config/connections/local_connection_store.c b/src/charon/charon/config/connections/local_connection_store.c index 3f07f0d21..0ae18e0a7 100644 --- a/src/charon/charon/config/connections/local_connection_store.c +++ b/src/charon/charon/config/connections/local_connection_store.c @@ -210,7 +210,7 @@ static void destroy (private_local_connection_store_t *this) /** * Described in header. */ -local_connection_store_t * local_connection_store_create() +local_connection_store_t * local_connection_store_create(void) { private_local_connection_store_t *this = malloc_thing(private_local_connection_store_t); diff --git a/src/charon/charon/config/connections/local_connection_store.h b/src/charon/charon/config/connections/local_connection_store.h index 14a0a24ae..6e73ef945 100644 --- a/src/charon/charon/config/connections/local_connection_store.h +++ b/src/charon/charon/config/connections/local_connection_store.h @@ -58,6 +58,6 @@ struct local_connection_store_t { * * @ingroup config */ -local_connection_store_t * local_connection_store_create(); +local_connection_store_t * local_connection_store_create(void); #endif /* LOCAL_CONNECTION_H_ */ diff --git a/src/charon/charon/config/credentials/local_credential_store.c b/src/charon/charon/config/credentials/local_credential_store.c index e4fa1aa26..2554eec4a 100644 --- a/src/charon/charon/config/credentials/local_credential_store.c +++ b/src/charon/charon/config/credentials/local_credential_store.c @@ -361,7 +361,7 @@ static void destroy(private_local_credential_store_t *this) /** * Described in header. */ -local_credential_store_t * local_credential_store_create() +local_credential_store_t * local_credential_store_create(void) { private_local_credential_store_t *this = malloc_thing(private_local_credential_store_t); diff --git a/src/charon/charon/config/credentials/local_credential_store.h b/src/charon/charon/config/credentials/local_credential_store.h index 64438b378..81b7568d7 100644 --- a/src/charon/charon/config/credentials/local_credential_store.h +++ b/src/charon/charon/config/credentials/local_credential_store.h @@ -80,6 +80,6 @@ struct local_credential_store_t { * * @ingroup config */ -local_credential_store_t *local_credential_store_create(); +local_credential_store_t *local_credential_store_create(void); #endif /* LOCAL_CREDENTIAL_H_ */ diff --git a/src/charon/charon/config/policies/local_policy_store.c b/src/charon/charon/config/policies/local_policy_store.c index ae02357ea..24d22f485 100644 --- a/src/charon/charon/config/policies/local_policy_store.c +++ b/src/charon/charon/config/policies/local_policy_store.c @@ -120,7 +120,7 @@ static void destroy(private_local_policy_store_t *this) /** * Described in header. */ -local_policy_store_t *local_policy_store_create() +local_policy_store_t *local_policy_store_create(void) { private_local_policy_store_t *this = malloc_thing(private_local_policy_store_t); diff --git a/src/charon/charon/config/policies/local_policy_store.h b/src/charon/charon/config/policies/local_policy_store.h index 7ab9e0efd..ce9b33d71 100644 --- a/src/charon/charon/config/policies/local_policy_store.h +++ b/src/charon/charon/config/policies/local_policy_store.h @@ -55,6 +55,6 @@ struct local_policy_store_t { * * @ingroup config */ -local_policy_store_t *local_policy_store_create(); +local_policy_store_t *local_policy_store_create(void); #endif /* LOCAL_POLICY_STORE_H_ */ diff --git a/src/charon/charon/daemon.c b/src/charon/charon/daemon.c index f3d9fecdb..c3d7ed766 100644 --- a/src/charon/charon/daemon.c +++ b/src/charon/charon/daemon.c @@ -287,7 +287,7 @@ void signal_handler(int signal) * * @return created daemon_t */ -private_daemon_t *daemon_create() +private_daemon_t *daemon_create(void) { private_daemon_t *this = malloc_thing(private_daemon_t); struct sigaction action; diff --git a/src/charon/charon/encoding/generator.h b/src/charon/charon/encoding/generator.h index 717d32b73..4bbca162a 100644 --- a/src/charon/charon/encoding/generator.h +++ b/src/charon/charon/encoding/generator.h @@ -96,6 +96,6 @@ struct generator_t { * * @ingroup encoding */ -generator_t *generator_create(); +generator_t *generator_create(void); #endif /*GENERATOR_H_*/ diff --git a/src/charon/charon/encoding/message.h b/src/charon/charon/encoding/message.h index e3a72f439..4b3f8e997 100644 --- a/src/charon/charon/encoding/message.h +++ b/src/charon/charon/encoding/message.h @@ -353,7 +353,7 @@ message_t * message_create_from_packet(packet_t *packet); * * @ingroup encoding */ -message_t * message_create(); +message_t * message_create(void); /** * @brief Creates an message_t object of type reply containing a notify payload. diff --git a/src/charon/charon/encoding/payloads/auth_payload.h b/src/charon/charon/encoding/payloads/auth_payload.h index e099cdfef..30db4f254 100644 --- a/src/charon/charon/encoding/payloads/auth_payload.h +++ b/src/charon/charon/encoding/payloads/auth_payload.h @@ -116,7 +116,7 @@ struct auth_payload_t { * * @ingroup payloads */ -auth_payload_t *auth_payload_create(); +auth_payload_t *auth_payload_create(void); #endif /* AUTH_PAYLOAD_H_ */ diff --git a/src/charon/charon/encoding/payloads/cert_payload.h b/src/charon/charon/encoding/payloads/cert_payload.h index 9148cfd31..51620d699 100644 --- a/src/charon/charon/encoding/payloads/cert_payload.h +++ b/src/charon/charon/encoding/payloads/cert_payload.h @@ -149,7 +149,7 @@ struct cert_payload_t { * * @ingroup payloads */ -cert_payload_t *cert_payload_create(); +cert_payload_t *cert_payload_create(void); #endif /* CERT_PAYLOAD_H_ */ diff --git a/src/charon/charon/encoding/payloads/certreq_payload.h b/src/charon/charon/encoding/payloads/certreq_payload.h index 3e88e7ffe..a4b0f1f50 100644 --- a/src/charon/charon/encoding/payloads/certreq_payload.h +++ b/src/charon/charon/encoding/payloads/certreq_payload.h @@ -119,7 +119,7 @@ struct certreq_payload_t { * * @ingroup payloads */ -certreq_payload_t *certreq_payload_create(); +certreq_payload_t *certreq_payload_create(void); #endif /* CERTREQ_PAYLOAD_H_ */ diff --git a/src/charon/charon/encoding/payloads/configuration_attribute.h b/src/charon/charon/encoding/payloads/configuration_attribute.h index 5b6b4f473..b8d95a190 100644 --- a/src/charon/charon/encoding/payloads/configuration_attribute.h +++ b/src/charon/charon/encoding/payloads/configuration_attribute.h @@ -144,6 +144,6 @@ struct configuration_attribute_t { * * @ingroup payloads */ -configuration_attribute_t *configuration_attribute_create(); +configuration_attribute_t *configuration_attribute_create(void); #endif /* CONFIGURATION_ATTRIBUTE_H_*/ diff --git a/src/charon/charon/encoding/payloads/cp_payload.h b/src/charon/charon/encoding/payloads/cp_payload.h index eb8076446..235d36f43 100644 --- a/src/charon/charon/encoding/payloads/cp_payload.h +++ b/src/charon/charon/encoding/payloads/cp_payload.h @@ -133,6 +133,6 @@ struct cp_payload_t { * * @ingroup payloads */ -cp_payload_t *cp_payload_create(); +cp_payload_t *cp_payload_create(void); #endif /*CP_PAYLOAD_H_*/ diff --git a/src/charon/charon/encoding/payloads/delete_payload.h b/src/charon/charon/encoding/payloads/delete_payload.h index 71a6317d4..a25d0f116 100644 --- a/src/charon/charon/encoding/payloads/delete_payload.h +++ b/src/charon/charon/encoding/payloads/delete_payload.h @@ -150,7 +150,7 @@ struct delete_payload_t { * * @ingroup payloads */ -delete_payload_t *delete_payload_create(); +delete_payload_t *delete_payload_create(void); #endif /* DELETE_PAYLOAD_H_ */ diff --git a/src/charon/charon/encoding/payloads/eap_payload.h b/src/charon/charon/encoding/payloads/eap_payload.h index 5e5a0c6d8..044d89cf8 100644 --- a/src/charon/charon/encoding/payloads/eap_payload.h +++ b/src/charon/charon/encoding/payloads/eap_payload.h @@ -99,7 +99,7 @@ struct eap_payload_t { * * @ingroup payloads */ -eap_payload_t *eap_payload_create(); +eap_payload_t *eap_payload_create(void); #endif /* EAP_PAYLOAD_H_ */ diff --git a/src/charon/charon/encoding/payloads/encryption_payload.h b/src/charon/charon/encoding/payloads/encryption_payload.h index 77be246c5..006df969c 100644 --- a/src/charon/charon/encoding/payloads/encryption_payload.h +++ b/src/charon/charon/encoding/payloads/encryption_payload.h @@ -190,7 +190,7 @@ struct encryption_payload_t { * * @ingroup payloads */ -encryption_payload_t *encryption_payload_create(); +encryption_payload_t *encryption_payload_create(void); #endif /*ENCRYPTION_PAYLOAD_H_*/ diff --git a/src/charon/charon/encoding/payloads/ike_header.h b/src/charon/charon/encoding/payloads/ike_header.h index ec55f0e18..bc4c40a5b 100644 --- a/src/charon/charon/encoding/payloads/ike_header.h +++ b/src/charon/charon/encoding/payloads/ike_header.h @@ -256,6 +256,6 @@ struct ike_header_t { * * @ingroup payloads */ -ike_header_t *ike_header_create(); +ike_header_t *ike_header_create(void); #endif /*IKE_HEADER_H_*/ diff --git a/src/charon/charon/encoding/payloads/ke_payload.h b/src/charon/charon/encoding/payloads/ke_payload.h index 982d29754..9490bef89 100644 --- a/src/charon/charon/encoding/payloads/ke_payload.h +++ b/src/charon/charon/encoding/payloads/ke_payload.h @@ -104,7 +104,7 @@ struct ke_payload_t { * * @ingroup payloads */ -ke_payload_t *ke_payload_create(); +ke_payload_t *ke_payload_create(void); #endif /*KE_PAYLOAD_H_*/ diff --git a/src/charon/charon/encoding/payloads/nonce_payload.h b/src/charon/charon/encoding/payloads/nonce_payload.h index 366dfec15..e875fb263 100644 --- a/src/charon/charon/encoding/payloads/nonce_payload.h +++ b/src/charon/charon/encoding/payloads/nonce_payload.h @@ -83,7 +83,7 @@ struct nonce_payload_t { * @ingroup payloads */ -nonce_payload_t *nonce_payload_create(); +nonce_payload_t *nonce_payload_create(void); #endif /*NONCE_PAYLOAD_H_*/ diff --git a/src/charon/charon/encoding/payloads/notify_payload.h b/src/charon/charon/encoding/payloads/notify_payload.h index 093f99144..4c9383e49 100644 --- a/src/charon/charon/encoding/payloads/notify_payload.h +++ b/src/charon/charon/encoding/payloads/notify_payload.h @@ -183,7 +183,7 @@ struct notify_payload_t { * * @ingroup payloads */ -notify_payload_t *notify_payload_create(); +notify_payload_t *notify_payload_create(void); /** * @brief Creates an notify_payload_t object of specific type for specific protocol id. diff --git a/src/charon/charon/encoding/payloads/proposal_substructure.h b/src/charon/charon/encoding/payloads/proposal_substructure.h index 506d25800..a59f9532f 100644 --- a/src/charon/charon/encoding/payloads/proposal_substructure.h +++ b/src/charon/charon/encoding/payloads/proposal_substructure.h @@ -208,7 +208,7 @@ struct proposal_substructure_t { * * @ingroup payloads */ -proposal_substructure_t *proposal_substructure_create(); +proposal_substructure_t *proposal_substructure_create(void); /** * @brief Creates a proposal substructure from a proposal. diff --git a/src/charon/charon/encoding/payloads/sa_payload.h b/src/charon/charon/encoding/payloads/sa_payload.h index 45095c030..3cf6f5065 100644 --- a/src/charon/charon/encoding/payloads/sa_payload.h +++ b/src/charon/charon/encoding/payloads/sa_payload.h @@ -112,7 +112,7 @@ struct sa_payload_t { * * @ingroup payloads */ -sa_payload_t *sa_payload_create(); +sa_payload_t *sa_payload_create(void); /** * @brief Creates a sa_payload_t object from a list of proposals. diff --git a/src/charon/charon/encoding/payloads/traffic_selector_substructure.h b/src/charon/charon/encoding/payloads/traffic_selector_substructure.h index 755917055..65b61dccf 100644 --- a/src/charon/charon/encoding/payloads/traffic_selector_substructure.h +++ b/src/charon/charon/encoding/payloads/traffic_selector_substructure.h @@ -154,7 +154,7 @@ struct traffic_selector_substructure_t { * * @ingroup payloads */ -traffic_selector_substructure_t *traffic_selector_substructure_create(); +traffic_selector_substructure_t *traffic_selector_substructure_create(void); /** * @brief Creates an initialized traffif selector substructure using diff --git a/src/charon/charon/encoding/payloads/transform_attribute.h b/src/charon/charon/encoding/payloads/transform_attribute.h index 547699915..e2ac946f6 100644 --- a/src/charon/charon/encoding/payloads/transform_attribute.h +++ b/src/charon/charon/encoding/payloads/transform_attribute.h @@ -138,7 +138,7 @@ struct transform_attribute_t { * * @ingroup payloads */ -transform_attribute_t *transform_attribute_create(); +transform_attribute_t *transform_attribute_create(void); /** * @brief Creates an transform_attribute_t of type KEY_LENGTH. diff --git a/src/charon/charon/encoding/payloads/transform_substructure.h b/src/charon/charon/encoding/payloads/transform_substructure.h index f6af3ee59..8aac55400 100644 --- a/src/charon/charon/encoding/payloads/transform_substructure.h +++ b/src/charon/charon/encoding/payloads/transform_substructure.h @@ -177,7 +177,7 @@ struct transform_substructure_t { * * @ingroup payloads */ -transform_substructure_t *transform_substructure_create(); +transform_substructure_t *transform_substructure_create(void); /** * @brief Creates an empty transform_substructure_t object. diff --git a/src/charon/charon/encoding/payloads/unknown_payload.h b/src/charon/charon/encoding/payloads/unknown_payload.h index 9c4926ea7..56cdd5677 100644 --- a/src/charon/charon/encoding/payloads/unknown_payload.h +++ b/src/charon/charon/encoding/payloads/unknown_payload.h @@ -89,7 +89,7 @@ struct unknown_payload_t { * * @ingroup payloads */ -unknown_payload_t *unknown_payload_create(); +unknown_payload_t *unknown_payload_create(void); #endif /* UNKNOWN_PAYLOAD_H_ */ diff --git a/src/charon/charon/encoding/payloads/vendor_id_payload.h b/src/charon/charon/encoding/payloads/vendor_id_payload.h index c9ead4337..1e4fdb510 100644 --- a/src/charon/charon/encoding/payloads/vendor_id_payload.h +++ b/src/charon/charon/encoding/payloads/vendor_id_payload.h @@ -97,7 +97,7 @@ struct vendor_id_payload_t { * * @ingroup payloads */ -vendor_id_payload_t *vendor_id_payload_create(); +vendor_id_payload_t *vendor_id_payload_create(void); #endif /* VENDOR_ID_PAYLOAD_H_ */ diff --git a/src/charon/charon/network/packet.c b/src/charon/charon/network/packet.c index 6cded72a3..6aaeca190 100644 --- a/src/charon/charon/network/packet.c +++ b/src/charon/charon/network/packet.c @@ -168,7 +168,7 @@ static packet_t *clone(private_packet_t *this) /* * Documented in header */ -packet_t *packet_create() +packet_t *packet_create(void) { private_packet_t *this = malloc_thing(private_packet_t); diff --git a/src/charon/charon/network/packet.h b/src/charon/charon/network/packet.h index a2620d391..9510ecd87 100644 --- a/src/charon/charon/network/packet.h +++ b/src/charon/charon/network/packet.h @@ -129,7 +129,7 @@ struct packet_t { * * @ingroup network */ -packet_t *packet_create(); +packet_t *packet_create(void); #endif /*PACKET_H_*/ diff --git a/src/charon/charon/queues/event_queue.h b/src/charon/charon/queues/event_queue.h index a60424100..638887dac 100644 --- a/src/charon/charon/queues/event_queue.h +++ b/src/charon/charon/queues/event_queue.h @@ -112,6 +112,6 @@ struct event_queue_t { * * @ingroup queues */ -event_queue_t *event_queue_create(); +event_queue_t *event_queue_create(void); #endif /*EVENT_QUEUE_H_*/ diff --git a/src/charon/charon/queues/job_queue.c b/src/charon/charon/queues/job_queue.c index 3640395ab..12a781c67 100644 --- a/src/charon/charon/queues/job_queue.c +++ b/src/charon/charon/queues/job_queue.c @@ -136,7 +136,7 @@ static void job_queue_destroy (private_job_queue_t *this) * * Documented in header */ -job_queue_t *job_queue_create() +job_queue_t *job_queue_create(void) { private_job_queue_t *this = malloc_thing(private_job_queue_t); diff --git a/src/charon/charon/queues/job_queue.h b/src/charon/charon/queues/job_queue.h index 9fcf08001..71cc5891e 100644 --- a/src/charon/charon/queues/job_queue.h +++ b/src/charon/charon/queues/job_queue.h @@ -94,6 +94,6 @@ struct job_queue_t { * * @ingroup queues */ -job_queue_t *job_queue_create(); +job_queue_t *job_queue_create(void); #endif /*JOB_QUEUE_H_*/ diff --git a/src/charon/charon/queues/send_queue.c b/src/charon/charon/queues/send_queue.c index 0852e5303..6a55d96ab 100644 --- a/src/charon/charon/queues/send_queue.c +++ b/src/charon/charon/queues/send_queue.c @@ -136,7 +136,7 @@ static void destroy (private_send_queue_t *this) * * Documented in header */ -send_queue_t *send_queue_create() +send_queue_t *send_queue_create(void) { private_send_queue_t *this = malloc_thing(private_send_queue_t); diff --git a/src/charon/charon/queues/send_queue.h b/src/charon/charon/queues/send_queue.h index 6dc5867eb..022a831fe 100644 --- a/src/charon/charon/queues/send_queue.h +++ b/src/charon/charon/queues/send_queue.h @@ -95,6 +95,6 @@ struct send_queue_t { * * @ingroup queues */ -send_queue_t *send_queue_create(); +send_queue_t *send_queue_create(void); #endif /*SEND_QUEUE_H_*/ diff --git a/src/charon/charon/sa/ike_sa_manager.h b/src/charon/charon/sa/ike_sa_manager.h index 822400a6a..d4cd749dc 100644 --- a/src/charon/charon/sa/ike_sa_manager.h +++ b/src/charon/charon/sa/ike_sa_manager.h @@ -189,6 +189,6 @@ struct ike_sa_manager_t { * * @ingroup sa */ -ike_sa_manager_t *ike_sa_manager_create(); +ike_sa_manager_t *ike_sa_manager_create(void); #endif /*IKE_SA_MANAGER_H_*/ diff --git a/src/charon/charon/threads/kernel_interface.h b/src/charon/charon/threads/kernel_interface.h index ceafa6468..b3ca13faa 100644 --- a/src/charon/charon/threads/kernel_interface.h +++ b/src/charon/charon/threads/kernel_interface.h @@ -180,6 +180,6 @@ struct kernel_interface_t { * * @ingroup threads */ -kernel_interface_t *kernel_interface_create(); +kernel_interface_t *kernel_interface_create(void); #endif /*KERNEL_INTERFACE_H_*/ diff --git a/src/charon/charon/threads/receiver.h b/src/charon/charon/threads/receiver.h index 932774f5f..1f9b644b1 100644 --- a/src/charon/charon/threads/receiver.h +++ b/src/charon/charon/threads/receiver.h @@ -62,6 +62,6 @@ struct receiver_t { * * @ingroup threads */ -receiver_t * receiver_create(); +receiver_t * receiver_create(void); #endif /*RECEIVER_H_*/ diff --git a/src/charon/charon/threads/scheduler.h b/src/charon/charon/threads/scheduler.h index 0165a718b..04d639d1b 100644 --- a/src/charon/charon/threads/scheduler.h +++ b/src/charon/charon/threads/scheduler.h @@ -62,6 +62,6 @@ struct scheduler_t { * * @ingroup threads */ -scheduler_t * scheduler_create(); +scheduler_t * scheduler_create(void); #endif /*SCHEDULER_H_*/ diff --git a/src/charon/charon/threads/sender.h b/src/charon/charon/threads/sender.h index ea8124147..2a41ccc66 100644 --- a/src/charon/charon/threads/sender.h +++ b/src/charon/charon/threads/sender.h @@ -58,6 +58,6 @@ struct sender_t { * * @ingroup threads */ -sender_t * sender_create(); +sender_t * sender_create(void); #endif /*SENDER_H_*/ diff --git a/src/charon/charon/threads/stroke_interface.h b/src/charon/charon/threads/stroke_interface.h index f8efc9c67..0ee41396f 100644 --- a/src/charon/charon/threads/stroke_interface.h +++ b/src/charon/charon/threads/stroke_interface.h @@ -81,6 +81,6 @@ struct stroke_t { * * @ingroup threads */ -stroke_t *stroke_create(); +stroke_t *stroke_create(void); #endif /* STROKE_INTERFACE_H_ */ diff --git a/src/charon/doc/Todo-list.txt b/src/charon/doc/Todo-list.txt index 2c4d163a7..7bff26d84 100644 --- a/src/charon/doc/Todo-list.txt +++ b/src/charon/doc/Todo-list.txt @@ -38,6 +38,10 @@ - certificate validation/chaining - certificate exchange ++ Apply -W's from Makefile.program to charon +- do ipsec status via starter +- add more output to to up/down, somehow... + - stroke status should show configured connections - stroke loglevel update - stroke argument parsing via getopts/gperf? diff --git a/src/charon/lib/asn1/asn1.c b/src/charon/lib/asn1/asn1.c index e894999fb..662f7fc1a 100644 --- a/src/charon/lib/asn1/asn1.c +++ b/src/charon/lib/asn1/asn1.c @@ -90,7 +90,7 @@ static logger_t *logger = NULL; /** * initializes the ASN.1 logger */ -static void asn1_init_logger() +static void asn1_init_logger(void) { if (logger == NULL) logger = logger_manager->get_logger(logger_manager, ASN1); diff --git a/src/charon/lib/asn1/pem.c b/src/charon/lib/asn1/pem.c index d3a6986eb..eca7e8d19 100755 --- a/src/charon/lib/asn1/pem.c +++ b/src/charon/lib/asn1/pem.c @@ -34,7 +34,7 @@ static logger_t *logger = NULL; /** * initializes the PEM logger */ -static void pem_init_logger() +static void pem_init_logger(void) { if (logger == NULL) logger = logger_manager->get_logger(logger_manager, ASN1); @@ -89,7 +89,7 @@ static bool find_boundary(const char* tag, chunk_t *line) /* * decrypts a DES-EDE-CBC encrypted data block */ -static err_t pem_decrypt(chunk_t *blob, chunk_t *iv, const char *passphrase) +static err_t pem_decrypt(chunk_t *blob, chunk_t *iv, char *passphrase) { hasher_t *hasher; crypter_t *crypter; @@ -144,7 +144,7 @@ static err_t pem_decrypt(chunk_t *blob, chunk_t *iv, const char *passphrase) * RFC 1421 Privacy Enhancement for Electronic Mail, February 1993 * RFC 934 Message Encapsulation, January 1985 */ -err_t pem_to_bin(chunk_t *blob, const char *passphrase, bool *pgp) +err_t pem_to_bin(chunk_t *blob, char *passphrase, bool *pgp) { typedef enum { PEM_PRE = 0, @@ -285,7 +285,7 @@ err_t pem_to_bin(chunk_t *blob, const char *passphrase, bool *pgp) /* load a coded key or certificate file with autodetection * of binary DER or base64 PEM ASN.1 formats and armored PGP format */ -bool pem_asn1_load_file(const char *filename, const char *passphrase, +bool pem_asn1_load_file(const char *filename, char *passphrase, const char *type, chunk_t *blob, bool *pgp) { err_t ugh = NULL; diff --git a/src/charon/lib/asn1/pem.h b/src/charon/lib/asn1/pem.h index 30621fa24..9edb3dc20 100755 --- a/src/charon/lib/asn1/pem.h +++ b/src/charon/lib/asn1/pem.h @@ -19,9 +19,9 @@ #include <types.h> -err_t pem_to_bin(chunk_t *blob, const char *passphrase, bool *pgp); +err_t pem_to_bin(chunk_t *blob, char *passphrase, bool *pgp); -bool pem_asn1_load_file(const char *filename, const char *passphrase, +bool pem_asn1_load_file(const char *filename, char *passphrase, const char *type, chunk_t *blob, bool *pgp); #endif /*PEM_H_*/ diff --git a/src/charon/lib/asn1/ttodata.c b/src/charon/lib/asn1/ttodata.c index 5e8149955..8114b12c5 100644 --- a/src/charon/lib/asn1/ttodata.c +++ b/src/charon/lib/asn1/ttodata.c @@ -33,22 +33,23 @@ static const char *badch(const char *, int, char *, size_t); #define BADCH3 (-7) /* invalid character 3 */ #define BADOFF(code) (BADCH0-(code)) -/* - - ttodatav - convert text to data, with verbose error reports +/** + * @brief convert text to data, with verbose error reports + * * If some of this looks slightly odd, it's because it has changed * repeatedly (from the original atodata()) without a major rewrite. + * + * @param src + * @param srclen 0 means apply strlen() + * @param base 0 means figure it out + * @param dst need not be valid if dstlen is 0 + * @param dstlen + * @param lenp where to record length (NULL is nowhere) + * @param errp error buffer + * @param flags + * @return NULL on success, else literal or errp */ -const char * /* NULL on success, else literal or errp */ -ttodatav(src, srclen, base, dst, dstlen, lenp, errp, errlen, flags) -const char *src; -size_t srclen; /* 0 means apply strlen() */ -int base; /* 0 means figure it out */ -char *dst; /* need not be valid if dstlen is 0 */ -size_t dstlen; -size_t *lenp; /* where to record length (NULL is nowhere) */ -char *errp; /* error buffer */ -size_t errlen; -unsigned int flags; +const char *ttodatav(const char *src, size_t srclen, int base, char *dst, size_t dstlen, size_t *lenp, char *errp, size_t errlen, unsigned int flags) { size_t ingroup; /* number of input bytes converted at once */ char buf[4]; /* output from conversion */ @@ -166,32 +167,35 @@ unsigned int flags; return NULL; } -/* - - ttodata - convert text to data +/** + * @brief ttodata - convert text to data + * + * @param src + * @param srclen 0 means apply strlen() + * @param base 0 means figure it out + * @param dst need not be valid if dstlen is 0 + * @param dstlen + * @param lenp where to record length (NULL is nowhere) + * @return NULL on success, else literal */ -const char * /* NULL on success, else literal */ -ttodata(src, srclen, base, dst, dstlen, lenp) -const char *src; -size_t srclen; /* 0 means apply strlen() */ -int base; /* 0 means figure it out */ -char *dst; /* need not be valid if dstlen is 0 */ -size_t dstlen; -size_t *lenp; /* where to record length (NULL is nowhere) */ +const char *ttodata(const char *src, size_t srclen, int base, char *dst, size_t dstlen, size_t *lenp) { return ttodatav(src, srclen, base, dst, dstlen, lenp, (char *)NULL, (size_t)0, TTODATAV_SPACECOUNTS); } -/* - - atodata - convert ASCII to data +/** + * @brief atodata - convert ASCII to data + * * backward-compatibility interface + * + * @param src + * @param srclen + * @param dst + * @param dstlen + * @return 0 for failure, true length for success */ -size_t /* 0 for failure, true length for success */ -atodata(src, srclen, dst, dstlen) -const char *src; -size_t srclen; -char *dst; -size_t dstlen; +size_t atodata(const char *src, size_t srclen, char *dst, size_t dstlen) { size_t len; const char *err; @@ -202,29 +206,25 @@ size_t dstlen; return len; } -/* - - atobytes - convert ASCII to data bytes +/** + * @brief atobytes - convert ASCII to data bytes + * * another backward-compatibility interface */ -const char * -atobytes(src, srclen, dst, dstlen, lenp) -const char *src; -size_t srclen; -char *dst; -size_t dstlen; -size_t *lenp; +const char *atobytes(const char *src, size_t srclen, char *dst, size_t dstlen, size_t *lenp) { return ttodata(src, srclen, 0, dst, dstlen, lenp); } -/* - - unhex - convert two ASCII hex digits to byte +/** + * @brief unhex - convert two ASCII hex digits to byte + * + * @param src known to be full length + * @param dstnumber of result bytes, or error code + * @param dstlen not large enough is a failure + * @return */ -static int /* number of result bytes, or error code */ -unhex(src, dst, dstlen) -const char *src; /* known to be full length */ -char *dst; -size_t dstlen; /* not large enough is a failure */ +static int unhex(const char *src, char *dst, size_t dstlen) { char *p; unsigned byte; @@ -252,16 +252,18 @@ size_t dstlen; /* not large enough is a failure */ return 1; } -/* - - unb64 - convert four ASCII base64 digits to three bytes +/** + * @brief unb64 - convert four ASCII base64 digits to three bytes + * * Note that a base64 digit group is padded out with '=' if it represents * less than three bytes: one byte is dd==, two is ddd=, three is dddd. + * + * @param src known to be full length + * @param dst + * @param dstlen + * @return number of result bytes, or error code */ -static int /* number of result bytes, or error code */ -unb64(src, dst, dstlen) -const char *src; /* known to be full length */ -char *dst; -size_t dstlen; +static int unb64(const char *src, char *dst, size_t dstlen) { char *p; unsigned byte1; @@ -316,14 +318,15 @@ size_t dstlen; return 3; } -/* - - untext - convert one ASCII character to byte +/** + * @brief untext - convert one ASCII character to byte + * + * @param src known to be full length + * @param dst + * @param dstlen not large enough is a failure + * @return number of result bytes, or error code */ -static int /* number of result bytes, or error code */ -untext(src, dst, dstlen) -const char *src; /* known to be full length */ -char *dst; -size_t dstlen; /* not large enough is a failure */ +static int untext(const char *src, char *dst, size_t dstlen) { if (dstlen < 1) return SHORT; @@ -332,18 +335,19 @@ size_t dstlen; /* not large enough is a failure */ return 1; } -/* - - badch - produce a nice complaint about an unknown character +/** + * @brief badch - produce a nice complaint about an unknown character * * If the compiler complains that the array bigenough[] has a negative * size, that means the TTODATAV_BUF constant has been set too small. + * + * @param src + * @param errcode + * @param errp might be NULL + * @param errlen + * @return literal or errp */ -static const char * /* literal or errp */ -badch(src, errcode, errp, errlen) -const char *src; -int errcode; -char *errp; /* might be NULL */ -size_t errlen; +static const char *badch(const char *src, int errcode, char *errp, size_t errlen) { static const char pre[] = "unknown character (`"; static const char suf[] = "') in input"; diff --git a/src/charon/lib/crypto/hashers/md5_hasher.c b/src/charon/lib/crypto/hashers/md5_hasher.c index bd3ab0c62..b0bc2f638 100644 --- a/src/charon/lib/crypto/hashers/md5_hasher.c +++ b/src/charon/lib/crypto/hashers/md5_hasher.c @@ -377,7 +377,7 @@ static void destroy(private_md5_hasher_t *this) /* * Described in header. */ -md5_hasher_t *md5_hasher_create() +md5_hasher_t *md5_hasher_create(void) { private_md5_hasher_t *this = malloc_thing(private_md5_hasher_t); diff --git a/src/charon/lib/crypto/hashers/md5_hasher.h b/src/charon/lib/crypto/hashers/md5_hasher.h index 1e6d95d19..3ee721bce 100644 --- a/src/charon/lib/crypto/hashers/md5_hasher.h +++ b/src/charon/lib/crypto/hashers/md5_hasher.h @@ -55,6 +55,6 @@ struct md5_hasher_t { * * @ingroup hashers */ -md5_hasher_t *md5_hasher_create(); +md5_hasher_t *md5_hasher_create(void); #endif /*MD5_HASHER_H_*/ diff --git a/src/charon/lib/crypto/hashers/sha1_hasher.c b/src/charon/lib/crypto/hashers/sha1_hasher.c index 2b82ef4ba..0dda019d0 100644 --- a/src/charon/lib/crypto/hashers/sha1_hasher.c +++ b/src/charon/lib/crypto/hashers/sha1_hasher.c @@ -252,7 +252,7 @@ static void destroy(private_sha1_hasher_t *this) /* * Described in header. */ -sha1_hasher_t *sha1_hasher_create() +sha1_hasher_t *sha1_hasher_create(void) { private_sha1_hasher_t *this = malloc_thing(private_sha1_hasher_t); diff --git a/src/charon/lib/crypto/hashers/sha1_hasher.h b/src/charon/lib/crypto/hashers/sha1_hasher.h index 5124ea1a8..d6d896a97 100644 --- a/src/charon/lib/crypto/hashers/sha1_hasher.h +++ b/src/charon/lib/crypto/hashers/sha1_hasher.h @@ -55,6 +55,6 @@ struct sha1_hasher_t { * * @ingroup hashers */ -sha1_hasher_t *sha1_hasher_create(); +sha1_hasher_t *sha1_hasher_create(void); #endif /*SHA1_HASHER_H_*/ diff --git a/src/charon/lib/crypto/rsa/rsa_private_key.c b/src/charon/lib/crypto/rsa/rsa_private_key.c index 86a38cbfe..f8798bbfd 100644 --- a/src/charon/lib/crypto/rsa/rsa_private_key.c +++ b/src/charon/lib/crypto/rsa/rsa_private_key.c @@ -170,7 +170,7 @@ static const asn1Object_t privkey_objects[] = { #define PRIV_KEY_COEFF 9 #define PRIV_KEY_ROOF 16 -static private_rsa_private_key_t *rsa_private_key_create_empty(); +static private_rsa_private_key_t *rsa_private_key_create_empty(void); /** * Implementation of private_rsa_private_key_t.compute_prime. @@ -546,7 +546,7 @@ static void destroy(private_rsa_private_key_t *this) /** * Internal generic constructor */ -static private_rsa_private_key_t *rsa_private_key_create_empty() +static private_rsa_private_key_t *rsa_private_key_create_empty(void) { private_rsa_private_key_t *this = malloc_thing(private_rsa_private_key_t); diff --git a/src/charon/lib/crypto/rsa/rsa_public_key.c b/src/charon/lib/crypto/rsa/rsa_public_key.c index 6601b6cda..74d9b4db9 100644 --- a/src/charon/lib/crypto/rsa/rsa_public_key.c +++ b/src/charon/lib/crypto/rsa/rsa_public_key.c @@ -150,7 +150,7 @@ struct rsa_public_key_info_t { chunk_t public_key; }; -private_rsa_public_key_t *rsa_public_key_create_empty(); +private_rsa_public_key_t *rsa_public_key_create_empty(void); /** * Implementation of private_rsa_public_key_t.rsaep and private_rsa_public_key_t.rsavp1 @@ -364,7 +364,7 @@ static void destroy(private_rsa_public_key_t *this) /** * Generic private constructor */ -private_rsa_public_key_t *rsa_public_key_create_empty() +private_rsa_public_key_t *rsa_public_key_create_empty(void) { private_rsa_public_key_t *this = malloc_thing(private_rsa_public_key_t); diff --git a/src/charon/lib/crypto/x509.c b/src/charon/lib/crypto/x509.c index 91f9f191e..6a9afcea5 100755 --- a/src/charon/lib/crypto/x509.c +++ b/src/charon/lib/crypto/x509.c @@ -874,9 +874,9 @@ x509_t *x509_create_from_chunk(chunk_t chunk) this->public_key = NULL; this->subject = NULL; this->issuer = NULL; - this->subjectAltNames = linked_list_create(this->subjectAltNames); - this->issuerAltNames = linked_list_create(this->issuerAltNames); - this->crlDistributionPoints = linked_list_create(this->crlDistributionPoints); + this->subjectAltNames = linked_list_create(); + this->issuerAltNames = linked_list_create(); + this->crlDistributionPoints = linked_list_create(); /* we do not use a per-instance logger right now, since its not always accessible */ logger = logger_manager->get_logger(logger_manager, ASN1); diff --git a/src/charon/lib/library.c b/src/charon/lib/library.c index fa9c732bf..6c4d15761 100644 --- a/src/charon/lib/library.c +++ b/src/charon/lib/library.c @@ -26,7 +26,7 @@ /** * Called whenever the library is linked from a process */ -void __attribute__ ((constructor)) library_init() +void __attribute__ ((constructor)) library_init(void) { logger_manager_init(); leak_detective_init(); @@ -35,7 +35,7 @@ void __attribute__ ((constructor)) library_init() /** * Called whenever the library is unlinked from a process */ -void __attribute__ ((destructor)) library_cleanup() +void __attribute__ ((destructor)) library_cleanup(void) { leak_detective_cleanup(); logger_manager_cleanup(); diff --git a/src/charon/lib/utils/host.c b/src/charon/lib/utils/host.c index 020ed27f3..b85dc07a5 100644 --- a/src/charon/lib/utils/host.c +++ b/src/charon/lib/utils/host.c @@ -261,7 +261,7 @@ static void destroy(private_host_t *this) /** * Creates an empty host_t object */ -static private_host_t *host_create_empty() +static private_host_t *host_create_empty(void) { private_host_t *this = malloc_thing(private_host_t); diff --git a/src/charon/lib/utils/identification.c b/src/charon/lib/utils/identification.c index 33f3d92cd..9c17ac54c 100644 --- a/src/charon/lib/utils/identification.c +++ b/src/charon/lib/utils/identification.c @@ -248,7 +248,7 @@ struct private_identification_t { id_type_t type; }; -static private_identification_t *identification_create(); +static private_identification_t *identification_create(void); /** @@ -952,7 +952,7 @@ static void destroy(private_identification_t *this) /** * Generic constructor used for the other constructors. */ -static private_identification_t *identification_create() +static private_identification_t *identification_create(void) { private_identification_t *this = malloc_thing(private_identification_t); diff --git a/src/charon/lib/utils/linked_list.h b/src/charon/lib/utils/linked_list.h index 8647f064d..f0070eda2 100644 --- a/src/charon/lib/utils/linked_list.h +++ b/src/charon/lib/utils/linked_list.h @@ -197,7 +197,7 @@ struct linked_list_t { * * @ingroup utils */ -linked_list_t *linked_list_create(); +linked_list_t *linked_list_create(void); #endif /*LINKED_LIST_H_*/ diff --git a/src/charon/lib/utils/logger_manager.h b/src/charon/lib/utils/logger_manager.h index a3ff5a37e..f6210c490 100644 --- a/src/charon/lib/utils/logger_manager.h +++ b/src/charon/lib/utils/logger_manager.h @@ -149,12 +149,12 @@ extern logger_manager_t *logger_manager; * Initialize the logger manager with all its logger. * Has to be called before logger_manager is accessed. */ -void logger_manager_init(); +void logger_manager_init(void); /** * Free any resources hold by the logger manager. Do * not access logger_manager after this call. */ -void logger_manager_cleanup(); +void logger_manager_cleanup(void); #endif /*LOGGER_MANAGER_H_*/ diff --git a/src/charon/lib/utils/randomizer.h b/src/charon/lib/utils/randomizer.h index 55519550e..993f71d12 100644 --- a/src/charon/lib/utils/randomizer.h +++ b/src/charon/lib/utils/randomizer.h @@ -105,6 +105,6 @@ struct randomizer_t { * * @ingroup utils */ -randomizer_t *randomizer_create(); +randomizer_t *randomizer_create(void); #endif /*RANDOMIZER_H_*/ |