Commit Graph

13 Commits

Author SHA1 Message Date
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 c8531b7e69 Added support for Phase1 IV synchronization to HA plugin 2012-03-20 17:31:37 +01:00
Martin Willi 8bcd9bd161 Added support to sync IKEv1 SAs key material in HA plugin 2012-03-20 17:31:37 +01:00
Tobias Brunner 94bbc60256 Renamed list of additional peer addresses as it now stores all known addresses. 2012-03-09 10:17:42 +01:00
Martin Willi 98788537be Synchronize ESN support in HA plugin 2011-04-20 12:26:58 +02:00
Martin Willi fa4f71c819 Synchronize EAP-Identity of remote peer 2010-07-26 15:10:54 +02:00
Martin Willi 3e6736f67e Pass initiator parameter to distinguish between original and exchange initiator 2010-07-26 13:53:53 +02:00
Martin Willi f2eebed2a3 Add enum names for HA message types 2010-07-26 11:33:00 +02:00
Martin Willi ad2488fcdf Use distinct message types for HA message ID updates 2010-07-26 10:15:17 +02:00
Martin Willi 00c1bd0606 Migrated ha plugin to INIT/METHOD macros 2010-07-26 10:15:17 +02:00
Martin Willi 140418453a Updated HA plugin to new APIs 2010-04-07 13:55:16 +02:00
Martin Willi 29a46aacad Moved ha plugin to libcharon 2010-04-07 13:55:16 +02:00