Merge branch 'ikev1-clean' into ikev1-master
authorMartin Willi <martin@revosec.ch>
Tue, 20 Mar 2012 16:56:18 +0000 (17:56 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 20 Mar 2012 16:57:53 +0000 (17:57 +0100)
commitb1f2f05c926f3e36755bb3b2711bd1732c062047
tree27f491ad55217d40051eb45db4de5a8a9217817a
parent3cea55b0c819f90045a7ae5657ed476834b74746
parentd112a7e1feb583d011ba7868bb3b27b147dc2f68
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.
39 files changed:
configure.in
man/ipsec.conf.5.in
src/libcharon/Makefile.am
src/libcharon/daemon.c
src/libcharon/encoding/payloads/notify_payload.c
src/libcharon/encoding/payloads/notify_payload.h
src/libcharon/plugins/eap_radius/eap_radius_accounting.c
src/libcharon/plugins/eap_radius/eap_radius_forward.c
src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
src/libcharon/plugins/ha/ha_dispatcher.c
src/libcharon/plugins/ha/ha_ike.c
src/libcharon/plugins/ha/ha_message.c
src/libcharon/plugins/ha/ha_message.h
src/libcharon/plugins/radattr/radattr_listener.c
src/libcharon/plugins/stroke/stroke_control.c
src/libcharon/plugins/stroke/stroke_cred.c
src/libcharon/plugins/stroke/stroke_list.c
src/libcharon/plugins/stroke/stroke_socket.c
src/libcharon/sa/ike_sa.c
src/libcharon/sa/ike_sa.h
src/libcharon/sa/ikev2/task_manager_v2.c
src/libcharon/sa/ikev2/tasks/ike_cert_pre.c
src/libcharon/sa/ikev2/tasks/ike_mobike.c
src/libcharon/sa/keymat.c
src/libcharon/sa/trap_manager.c
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
src/libstrongswan/asn1/oid.txt
src/libstrongswan/credentials/auth_cfg.h
src/libstrongswan/credentials/certificates/x509.h
src/libstrongswan/credentials/credential_manager.c
src/libstrongswan/credentials/credential_manager.h
src/libstrongswan/plugins/x509/x509_cert.c
src/libstrongswan/utils.h
src/pki/commands/issue.c
src/pki/commands/self.c
src/pluto/keys.c
src/starter/confread.c
src/starter/confread.h
src/stroke/stroke.c