git.ipfire.org Git - people/ms/strongswan.git/commit

]> git.ipfire.org Git - people/ms/strongswan.git/commit

projects / people / ms / strongswan.git / commit

author	Martin Willi <martin@revosec.ch>
	Tue, 20 Mar 2012 16:56:18 +0000 (17:56 +0100)
committer	Martin Willi <martin@revosec.ch>
	Tue, 20 Mar 2012 16:57:53 +0000 (17:57 +0100)
commit	b1f2f05c926f3e36755bb3b2711bd1732c062047
tree	27f491ad55217d40051eb45db4de5a8a9217817a	tree \| snapshot
parent	3cea55b0c819f90045a7ae5657ed476834b74746	commit \| diff
parent	d112a7e1feb583d011ba7868bb3b27b147dc2f68	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
man/ipsec.conf.5.in	diff1 \|	diff2 \|	blob \| history
src/libcharon/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/libcharon/daemon.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/notify_payload.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/notify_payload.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/eap_radius/eap_radius_accounting.c	diff1 \|	\|	blob \| history
src/libcharon/plugins/eap_radius/eap_radius_forward.c	diff1 \|	\|	blob \| history
src/libcharon/plugins/eap_ttls/eap_ttls_peer.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_dispatcher.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_ike.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_message.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_message.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/radattr/radattr_listener.c	diff1 \|	\|	blob \| history
src/libcharon/plugins/stroke/stroke_control.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_cred.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_list.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_socket.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ike_sa.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ike_sa.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/task_manager_v2.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_cert_pre.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_mobike.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/keymat.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/trap_manager.c	diff1 \|	diff2 \|	blob \| history
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/asn1/oid.txt	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/auth_cfg.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/certificates/x509.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/credential_manager.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/credential_manager.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/plugins/x509/x509_cert.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/utils.h	diff1 \|	diff2 \|	blob \| history
src/pki/commands/issue.c	diff1 \|	diff2 \|	blob \| history
src/pki/commands/self.c	diff1 \|	diff2 \|	blob \| history
src/pluto/keys.c	diff1 \|	diff2 \|	blob \| history
src/starter/confread.c	diff1 \|	diff2 \|	blob \| history
src/starter/confread.h	diff1 \|	diff2 \|	blob \| history
src/stroke/stroke.c	diff1 \|	diff2 \|	blob \| history

Michael's strongswan development tree

RSS Atom

configure.in	diff1 \|	diff2 \|	blob \| history
man/ipsec.conf.5.in	diff1 \|	diff2 \|	blob \| history
src/libcharon/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/libcharon/daemon.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/notify_payload.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/notify_payload.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/eap_radius/eap_radius_accounting.c	diff1 \|	\|	blob \| history
src/libcharon/plugins/eap_radius/eap_radius_forward.c	diff1 \|	\|	blob \| history
src/libcharon/plugins/eap_ttls/eap_ttls_peer.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_dispatcher.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_ike.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_message.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/ha/ha_message.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/radattr/radattr_listener.c	diff1 \|	\|	blob \| history
src/libcharon/plugins/stroke/stroke_control.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_cred.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_list.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_socket.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ike_sa.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ike_sa.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/task_manager_v2.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_cert_pre.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_mobike.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/keymat.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/trap_manager.c	diff1 \|	diff2 \|	blob \| history
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/asn1/oid.txt	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/auth_cfg.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/certificates/x509.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/credential_manager.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/credential_manager.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/plugins/x509/x509_cert.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/utils.h	diff1 \|	diff2 \|	blob \| history
src/pki/commands/issue.c	diff1 \|	diff2 \|	blob \| history
src/pki/commands/self.c	diff1 \|	diff2 \|	blob \| history
src/pluto/keys.c	diff1 \|	diff2 \|	blob \| history
src/starter/confread.c	diff1 \|	diff2 \|	blob \| history
src/starter/confread.h	diff1 \|	diff2 \|	blob \| history
src/stroke/stroke.c	diff1 \|	diff2 \|	blob \| history