Commit Graph
125 Commits
Author SHA1 Message Date
Andreas Steffen f7cd1cde70 vendor ID cosmetics 2012-05-05 18:13:05 +02:00
Tobias Brunner 42500c274a Use name from initialization to access settings in libcharon.
Also fixes several whitespace errors.
2012-05-03 13:57:04 +02:00
Martin Willi b24be29646 Merge branch 'ikev1'
Conflicts:
	configure.in
	man/ipsec.conf.5.in
	src/libcharon/encoding/generator.c
	src/libcharon/encoding/payloads/notify_payload.c
	src/libcharon/encoding/payloads/notify_payload.h
	src/libcharon/encoding/payloads/payload.c
	src/libcharon/network/receiver.c
	src/libcharon/sa/authenticator.c
	src/libcharon/sa/authenticator.h
	src/libcharon/sa/ikev2/tasks/ike_init.c
	src/libcharon/sa/task_manager.c
	src/libstrongswan/credentials/auth_cfg.c
2012-05-02 11:12:31 +02:00
Martin Willi b1f2f05c92 Merge branch 'ikev1-clean' into ikev1-master
Conflicts:
	configure.in
	man/ipsec.conf.5.in
	src/libcharon/daemon.c
	src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
	src/libcharon/plugins/eap_radius/eap_radius_accounting.c
	src/libcharon/plugins/eap_radius/eap_radius_forward.c
	src/libcharon/plugins/farp/farp_listener.c
	src/libcharon/sa/ike_sa.c
	src/libcharon/sa/keymat.c
	src/libcharon/sa/task_manager.c
	src/libcharon/sa/trap_manager.c
	src/libstrongswan/plugins/x509/x509_cert.c
	src/libstrongswan/utils.h

Applied lost changes of moved files keymat.c and task_manager.c.
Updated listener_t.message hook signature in new plugins.
2012-03-20 17:57:53 +01:00
Tobias Brunner 1726795fa9 Store the major IKE version on ike_sa_id_t. 2012-03-20 17:31:40 +01:00
Martin Willi a7d3b0e098 Check if we actually have a packet before retransmitting it 2012-03-20 17:31:40 +01:00
Martin Willi 47b8f6ef4b Invoke bus_t.message hook twice, once plain and parsed, once encoded and encrypted 2012-03-20 17:31:37 +01:00
Martin Willi 23f9e7a18d Pass IKEv1 specific keymat to ike_keys hook 2012-03-20 17:31:37 +01:00
Martin Willi 3957a6e4f3 Get a reference for the child_cfg passed to child_create_create() 2012-03-20 17:31:36 +01:00
Martin Willi 3a925f74ab Do not query CHILD_SA during delete if they already expired 2012-03-20 17:31:31 +01:00
Martin Willi 3bacc1f429 Added a keymat_t version to cast it safely 2012-03-20 17:31:30 +01:00
Martin Willi 3d54ae94d9 Handle initiation of not supported IKE versions properly 2012-03-20 17:31:30 +01:00
Martin Willi 8573b18d22 Fixed scheduling of IKEv2 init tasks in a second keyingtry 2012-03-20 17:31:29 +01:00
Martin Willi 326a94232d Moved eap/xauth classes out of protocol specific subdirectories 2012-03-20 17:31:27 +01:00
Martin Willi 873df908cc Moved MOBIKE task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi 26eee421b4 Check in task manager if we have to requeue IKE tasks in a non-first keyingtry 2012-03-20 17:31:27 +01:00
Martin Willi cedb412e5a Moved IKE_SA reauth task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi dab60d6411 Moved IKE_SA rekey task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi 3ed148b37e Moved IKE_SA delete task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi 83c5fda053 Moved CHILD_SA delete task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi 463a73cc0f Moved CHILD_SA rekey task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi fe43d9a237 Moved CHILD_SA initiate task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi a60daa07f6 Moved IKE_SA initiate task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi 244d715de5 Moved liveness checking task creation to protocol specific task manager 2012-03-20 17:31:27 +01:00
Martin Willi 15a682f4c2 Separated libcharon/sa directory with ikev1 and ikev2 subfolders 2012-03-20 17:31:26 +01:00