Merge branch 'ikev1'
authorMartin Willi <martin@revosec.ch>
Wed, 2 May 2012 09:12:31 +0000 (11:12 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 2 May 2012 09:12:31 +0000 (11:12 +0200)
commitb24be29646442210f43b100d2282b6c0a0e52e09
tree5cdc2dbda7cb5881c2c2fa7a90ab6729112fd4c4
parentf99d8b10c9f5b5024b4b1e5f5d1e56e2519cdadc
parent8c35f5d460baf0ee7f25669620ee234a0176681f
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
man/ipsec.conf.5.in
src/libcharon/daemon.c
src/libcharon/encoding/generator.c
src/libcharon/encoding/parser.c
src/libcharon/encoding/payloads/certreq_payload.c
src/libcharon/encoding/payloads/notify_payload.c
src/libcharon/encoding/payloads/notify_payload.h
src/libcharon/encoding/payloads/payload.c
src/libcharon/encoding/payloads/payload.h
src/libcharon/network/receiver.c
src/libcharon/plugins/smp/smp.c
src/libcharon/plugins/stroke/stroke_config.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/authenticator.c
src/libcharon/sa/authenticator.h
src/libcharon/sa/ike_sa.c
src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
src/libcharon/sa/ikev2/task_manager_v2.c
src/libcharon/sa/ikev2/tasks/ike_auth.c
src/libcharon/sa/ikev2/tasks/ike_init.c
src/libcharon/sa/keymat.h
src/libstrongswan/asn1/oid.txt
src/libstrongswan/chunk.h
src/libstrongswan/credentials/auth_cfg.c
src/libstrongswan/credentials/auth_cfg.h
src/libstrongswan/utils.h
src/pki/commands/print.c
src/pluto/keys.c
src/starter/starterstroke.c
src/stroke/stroke.c
src/stroke/stroke_msg.h