Martin Willi b24be29646 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

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

..

certificates

Merge branch 'ikev1-clean' into ikev1-master

2012-03-20 17:57:53 +01:00

ietf_attributes

Migrated ietf_attributes to INIT/METHOD macros

2011-09-29 22:46:43 +02:00

keys

Reverse the changes made to openssl plugin for signature verification

2011-11-28 21:18:05 +01:00

sets

Migrated auth_cfg_wrapper to INIT/METHOD macros

2011-09-29 22:10:30 +02:00

auth_cfg.c

Merge branch 'ikev1'

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

auth_cfg.h

Merge branch 'ikev1'

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

builder.c

Add builder part for parameters from algorithmIdentifier.

2012-02-01 18:27:45 +01:00

builder.h

Add builder part for parameters from algorithmIdentifier.

2012-02-01 18:27:45 +01:00

cert_validator.h

Some documentation corrections

2012-01-12 11:25:12 +01:00

cred_encoding.c

Fixed compiler warnings regarding enum comparison.

2011-11-25 09:40:30 +01:00

cred_encoding.h

Some documentation corrections

2012-01-12 11:25:12 +01:00

credential_factory.c

…

credential_factory.h

Some documentation corrections

2012-01-12 11:25:12 +01:00

credential_manager.c

Merge branch 'ikev1-clean' into ikev1-master

2012-03-20 17:57:53 +01:00

credential_manager.h

Merge branch 'ikev1-clean' into ikev1-master

2012-03-20 17:57:53 +01:00

credential_set.h

Some documentation corrections

2012-01-12 11:25:12 +01:00