Merge branch 'multi-cert'
authorMartin Willi <martin@revosec.ch>
Fri, 1 Mar 2013 10:35:32 +0000 (11:35 +0100)
committerMartin Willi <martin@revosec.ch>
Fri, 1 Mar 2013 10:35:32 +0000 (11:35 +0100)
Allows the configuration of multiple certificates in leftcert, and select
the correct certificate to use based on the received certificate requests.

1  2 
man/ipsec.conf.5.in
src/libcharon/plugins/stroke/stroke_config.c
src/libstrongswan/credentials/auth_cfg.c
src/libstrongswan/credentials/credential_manager.c

Simple merge