Merge branch 'ikev1'

Browse Source

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

...

This commit is contained in:

Martin Willi

2012-05-02 11:12:31 +02:00

parent f99d8b10c9 8c35f5d460

commit b24be29646

297 changed files with 22065 additions and 5546 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/libcharon/sa/ikev2/task_manager_v2.c

+1484

File diff suppressed because it is too large Load Diff