git.strongswan.org Git - strongswan.git/commit

author	Martin Willi <martin@revosec.ch>
	Wed, 2 May 2012 09:12:31 +0000 (11:12 +0200)
committer	Martin Willi <martin@revosec.ch>
	Wed, 2 May 2012 09:12:31 +0000 (11:12 +0200)
commit	b24be29646442210f43b100d2282b6c0a0e52e09
tree	5cdc2dbda7cb5881c2c2fa7a90ab6729112fd4c4	tree \| snapshot
parent	f99d8b10c9f5b5024b4b1e5f5d1e56e2519cdadc	commit \| diff
parent	8c35f5d460baf0ee7f25669620ee234a0176681f	commit \| diff

Merge branch 'ikev1'

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

34 files changed:

configure.in	diff1 \|	diff2 \|	blob \| history
man/ipsec.conf.5.in	diff1 \|	diff2 \|	blob \| history
src/libcharon/daemon.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/generator.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/parser.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/certreq_payload.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/encoding/payloads/payload.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/payload.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/network/receiver.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/smp/smp.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_config.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/authenticator.c	\|	diff2 \|	blob \| history
src/libcharon/sa/authenticator.h	\|	diff2 \|	blob \| history
src/libcharon/sa/ike_sa.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/authenticators/eap_authenticator.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/task_manager_v2.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_auth.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_init.c	\|	diff2 \|	blob \| history
src/libcharon/sa/keymat.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/asn1/oid.txt	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/chunk.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/auth_cfg.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/auth_cfg.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/utils.h	diff1 \|	diff2 \|	blob \| history
src/pki/commands/print.c	diff1 \|	diff2 \|	blob \| history
src/pluto/keys.c	diff1 \|	diff2 \|	blob \| history
src/starter/starterstroke.c	diff1 \|	diff2 \|	blob \| history
src/stroke/stroke.c	diff1 \|	diff2 \|	blob \| history
src/stroke/stroke_msg.h	diff1 \|	diff2 \|	blob \| history

strongSwan - IPsec VPN

RSS Atom

configure.in	diff1 \|	diff2 \|	blob \| history
man/ipsec.conf.5.in	diff1 \|	diff2 \|	blob \| history
src/libcharon/daemon.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/generator.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/parser.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/certreq_payload.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/encoding/payloads/payload.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/encoding/payloads/payload.h	diff1 \|	diff2 \|	blob \| history
src/libcharon/network/receiver.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/smp/smp.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/plugins/stroke/stroke_config.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/authenticator.c	\|	diff2 \|	blob \| history
src/libcharon/sa/authenticator.h	\|	diff2 \|	blob \| history
src/libcharon/sa/ike_sa.c	diff1 \|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/authenticators/eap_authenticator.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/task_manager_v2.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_auth.c	\|	diff2 \|	blob \| history
src/libcharon/sa/ikev2/tasks/ike_init.c	\|	diff2 \|	blob \| history
src/libcharon/sa/keymat.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/asn1/oid.txt	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/chunk.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/auth_cfg.c	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/credentials/auth_cfg.h	diff1 \|	diff2 \|	blob \| history
src/libstrongswan/utils.h	diff1 \|	diff2 \|	blob \| history
src/pki/commands/print.c	diff1 \|	diff2 \|	blob \| history
src/pluto/keys.c	diff1 \|	diff2 \|	blob \| history
src/starter/starterstroke.c	diff1 \|	diff2 \|	blob \| history
src/stroke/stroke.c	diff1 \|	diff2 \|	blob \| history
src/stroke/stroke_msg.h	diff1 \|	diff2 \|	blob \| history