strongswan/src/libcharon/encoding
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
..
payloads Merge branch 'ikev1-clean' into ikev1-master 2012-03-20 17:57:53 +01:00
generator.c Renamed CONFIGURATION_ATTRIBUTE_LENGTH to streamline it with other ATTRIBUTE rules 2012-03-20 17:31:38 +01:00
generator.h Added an option to create a generator that does not log debug messages. 2012-03-20 17:31:09 +01:00
message.c Store the major IKE version on ike_sa_id_t. 2012-03-20 17:31:40 +01:00
message.h Provide keymat_t to message_t to encrypt/decrypt data. 2012-03-20 17:30:45 +01:00
parser.c Renamed CONFIGURATION_ATTRIBUTE_LENGTH to streamline it with other ATTRIBUTE rules 2012-03-20 17:31:38 +01:00
parser.h Moving charon to libcharon. 2010-03-19 13:34:52 +01:00