[Pkg-swan-devel] [strongswan] 02/08: Merge tag 'upstream/5.4.0'

Yves-Alexis Perez corsac at moszumanska.debian.org
Mon Apr 4 11:17:32 UTC 2016


This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch master
in repository strongswan.

commit 14275f20dd704bd6c3b97b234940c325db082c83
Merge: 2696234 518dd33
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Thu Mar 24 11:59:32 2016 +0100

    Merge tag 'upstream/5.4.0'
    
    Upstream version 5.4.0

 Android.common.mk                                  |    2 +-
 Android.mk                                         |    1 -
 Makefile.in                                        |    2 +
 NEWS                                               |   40 +
 conf/Makefile.am                                   |    1 +
 conf/Makefile.in                                   |    3 +
 conf/format-options.py                             |   42 +-
 conf/options/charon.conf                           |    8 +-
 conf/options/charon.opt                            |   13 +-
 conf/plugins/p-cscf.conf                           |   18 +
 conf/plugins/p-cscf.opt                            |   11 +
 conf/strongswan.conf.5.main                        |   24 +-
 config.h.in                                        |    3 +
 configure                                          |  588 +++-
 configure.ac                                       |   74 +-
 init/Makefile.in                                   |    2 +
 init/systemd-swanctl/Makefile.in                   |    2 +
 init/systemd-swanctl/strongswan-swanctl.service.in |    3 +
 init/systemd/Makefile.in                           |    2 +
 man/Makefile.in                                    |    2 +
 man/ipsec.conf.5.in                                |   21 +-
 scripts/Makefile.in                                |    2 +
 src/Makefile.am                                    |    4 -
 src/Makefile.in                                    |   82 +-
 src/_copyright/Makefile.in                         |    2 +
 src/_updown/Makefile.in                            |    2 +
 src/aikgen/Makefile.in                             |    2 +
 src/charon-cmd/Makefile.am                         |    2 -
 src/charon-cmd/Makefile.in                         |    5 +-
 src/charon-cmd/charon-cmd.c                        |    6 -
 src/charon-nm/Makefile.am                          |    2 -
 src/charon-nm/Makefile.in                          |    5 +-
 src/charon-nm/charon-nm.c                          |   11 -
 src/charon-svc/Makefile.am                         |    2 -
 src/charon-svc/Makefile.in                         |    5 +-
 src/charon-svc/charon-svc.c                        |   32 +-
 src/charon-systemd/Makefile.am                     |    6 +-
 src/charon-systemd/Makefile.in                     |   12 +-
 src/charon-systemd/charon-systemd.c                |   16 +-
 src/charon-tkm/Makefile.am                         |    6 +-
 src/charon-tkm/Makefile.in                         |    8 +-
 src/charon-tkm/src/charon-tkm.c                    |   10 -
 src/charon-tkm/src/ees/ees_callbacks.c             |    8 +-
 src/charon-tkm/tests/keymat_tests.c                |    1 -
 src/charon-tkm/tests/tests.c                       |    5 -
 src/charon/Android.mk                              |    3 +-
 src/charon/Makefile.am                             |    2 -
 src/charon/Makefile.in                             |    5 +-
 src/charon/charon.c                                |   11 -
 src/checksum/Makefile.am                           |   10 -
 src/checksum/Makefile.in                           |   79 +-
 src/checksum/checksum_builder.c                    |    7 +-
 src/conftest/Makefile.am                           |    2 -
 src/conftest/Makefile.in                           |    5 +-
 src/conftest/conftest.c                            |    8 -
 src/conftest/conftest.h                            |    1 -
 src/dumm/Makefile.in                               |    2 +
 src/include/Makefile.in                            |    2 +
 src/ipsec/Makefile.in                              |    2 +
 src/ipsec/_ipsec.8                                 |    2 +-
 src/ipsec/_ipsec.in                                |    9 +-
 src/libcharon/Android.mk                           |   20 +-
 src/libcharon/Makefile.am                          |   42 +-
 src/libcharon/Makefile.in                          |  339 ++-
 src/libcharon/attributes/attributes.c              |   16 +-
 src/libcharon/attributes/attributes.h              |    3 +
 src/libcharon/attributes/mem_pool.c                |    1 -
 src/libcharon/bus/listeners/custom_logger.h        |   65 +
 src/libcharon/config/child_cfg.c                   |   54 +-
 src/libcharon/config/child_cfg.h                   |   10 +-
 src/libcharon/config/ike_cfg.c                     |   24 +-
 src/libcharon/config/peer_cfg.c                    |  157 +-
 src/libcharon/config/peer_cfg.h                    |   16 +-
 src/libcharon/config/proposal.c                    |  180 +-
 src/libcharon/daemon.c                             |  278 +-
 src/libcharon/daemon.h                             |   53 +-
 src/libcharon/encoding/message.c                   |   12 +-
 .../encoding/payloads/configuration_attribute.c    |    9 +
 src/libcharon/kernel/kernel_handler.c              |    7 +-
 src/libcharon/kernel/kernel_handler.h              |    2 +-
 src/libcharon/kernel/kernel_interface.c            | 1085 +++++++
 src/libcharon/kernel/kernel_interface.h            |  655 +++++
 src/libcharon/kernel/kernel_ipsec.c                |   36 +
 src/libcharon/kernel/kernel_ipsec.h                |  297 ++
 src/libcharon/kernel/kernel_listener.h             |  107 +
 src/libcharon/kernel/kernel_net.c                  |   36 +
 src/libcharon/kernel/kernel_net.h                  |  196 ++
 src/libcharon/network/receiver.c                   |    6 +-
 src/libcharon/plugins/addrblock/Makefile.am        |    1 -
 src/libcharon/plugins/addrblock/Makefile.in        |    3 +-
 src/libcharon/plugins/android_dns/Makefile.am      |    1 -
 src/libcharon/plugins/android_dns/Makefile.in      |    3 +-
 src/libcharon/plugins/android_log/Makefile.am      |    1 -
 src/libcharon/plugins/android_log/Makefile.in      |    3 +-
 src/libcharon/plugins/attr/Makefile.am             |    1 -
 src/libcharon/plugins/attr/Makefile.in             |    3 +-
 src/libcharon/plugins/attr/attr_provider.c         |   67 +-
 src/libcharon/plugins/attr_sql/Makefile.am         |    1 -
 src/libcharon/plugins/attr_sql/Makefile.in         |    3 +-
 src/libcharon/plugins/certexpire/Makefile.am       |    1 -
 src/libcharon/plugins/certexpire/Makefile.in       |    3 +-
 src/libcharon/plugins/connmark/Makefile.am         |    1 -
 src/libcharon/plugins/connmark/Makefile.in         |    3 +-
 src/libcharon/plugins/connmark/connmark_listener.c |  354 ++-
 src/libcharon/plugins/coupling/Makefile.am         |    1 -
 src/libcharon/plugins/coupling/Makefile.in         |    3 +-
 src/libcharon/plugins/dhcp/Makefile.am             |    1 -
 src/libcharon/plugins/dhcp/Makefile.in             |    3 +-
 src/libcharon/plugins/dhcp/dhcp_socket.c           |    4 +-
 src/libcharon/plugins/dnscert/Makefile.am          |    1 -
 src/libcharon/plugins/dnscert/Makefile.in          |    3 +-
 src/libcharon/plugins/duplicheck/Makefile.am       |    1 -
 src/libcharon/plugins/duplicheck/Makefile.in       |    3 +-
 src/libcharon/plugins/duplicheck/duplicheck.c      |    2 +
 src/libcharon/plugins/eap_aka/Makefile.am          |    1 -
 src/libcharon/plugins/eap_aka/Makefile.in          |    3 +-
 src/libcharon/plugins/eap_aka_3gpp2/Makefile.am    |    1 -
 src/libcharon/plugins/eap_aka_3gpp2/Makefile.in    |    3 +-
 src/libcharon/plugins/eap_dynamic/Makefile.am      |    1 -
 src/libcharon/plugins/eap_dynamic/Makefile.in      |    3 +-
 src/libcharon/plugins/eap_gtc/Makefile.am          |    1 -
 src/libcharon/plugins/eap_gtc/Makefile.in          |    3 +-
 src/libcharon/plugins/eap_identity/Makefile.am     |    1 -
 src/libcharon/plugins/eap_identity/Makefile.in     |    3 +-
 src/libcharon/plugins/eap_md5/Makefile.am          |    1 -
 src/libcharon/plugins/eap_md5/Makefile.in          |    3 +-
 src/libcharon/plugins/eap_mschapv2/Makefile.am     |    1 -
 src/libcharon/plugins/eap_mschapv2/Makefile.in     |    3 +-
 src/libcharon/plugins/eap_peap/Makefile.am         |    1 -
 src/libcharon/plugins/eap_peap/Makefile.in         |    3 +-
 src/libcharon/plugins/eap_radius/Makefile.am       |    1 -
 src/libcharon/plugins/eap_radius/Makefile.in       |    3 +-
 src/libcharon/plugins/eap_sim/Makefile.am          |    1 -
 src/libcharon/plugins/eap_sim/Makefile.in          |    3 +-
 src/libcharon/plugins/eap_sim_file/Makefile.am     |    1 -
 src/libcharon/plugins/eap_sim_file/Makefile.in     |    3 +-
 src/libcharon/plugins/eap_sim_pcsc/Makefile.am     |    1 -
 src/libcharon/plugins/eap_sim_pcsc/Makefile.in     |    3 +-
 .../plugins/eap_simaka_pseudonym/Makefile.am       |    1 -
 .../plugins/eap_simaka_pseudonym/Makefile.in       |    3 +-
 .../plugins/eap_simaka_reauth/Makefile.am          |    1 -
 .../plugins/eap_simaka_reauth/Makefile.in          |    3 +-
 src/libcharon/plugins/eap_simaka_sql/Makefile.am   |    1 -
 src/libcharon/plugins/eap_simaka_sql/Makefile.in   |    3 +-
 src/libcharon/plugins/eap_tls/Makefile.am          |    1 -
 src/libcharon/plugins/eap_tls/Makefile.in          |    3 +-
 src/libcharon/plugins/eap_tnc/Makefile.am          |    1 -
 src/libcharon/plugins/eap_tnc/Makefile.in          |    3 +-
 src/libcharon/plugins/eap_tnc/eap_tnc.c            |    2 +-
 src/libcharon/plugins/eap_ttls/Makefile.am         |    1 -
 src/libcharon/plugins/eap_ttls/Makefile.in         |    3 +-
 src/libcharon/plugins/error_notify/Makefile.am     |    1 -
 src/libcharon/plugins/error_notify/Makefile.in     |    3 +-
 src/libcharon/plugins/ext_auth/Makefile.am         |    1 -
 src/libcharon/plugins/ext_auth/Makefile.in         |    3 +-
 src/libcharon/plugins/farp/Makefile.am             |    1 -
 src/libcharon/plugins/farp/Makefile.in             |    3 +-
 src/libcharon/plugins/forecast/Makefile.am         |    1 -
 src/libcharon/plugins/forecast/Makefile.in         |    3 +-
 .../plugins/forecast/forecast_forwarder.c          |    8 +-
 src/libcharon/plugins/forecast/forecast_listener.c |  252 +-
 src/libcharon/plugins/ha/Makefile.am               |    1 -
 src/libcharon/plugins/ha/Makefile.in               |    3 +-
 src/libcharon/plugins/ha/ha_child.c                |    4 +
 src/libcharon/plugins/ha/ha_dispatcher.c           |   17 +-
 src/libcharon/plugins/ha/ha_ike.c                  |   32 +-
 src/libcharon/plugins/ha/ha_message.c              |    2 +
 src/libcharon/plugins/ha/ha_message.h              |    2 +
 src/libcharon/plugins/ipseckey/Makefile.am         |    1 -
 src/libcharon/plugins/ipseckey/Makefile.in         |    3 +-
 src/libcharon/plugins/kernel_iph/Makefile.am       |    1 -
 src/libcharon/plugins/kernel_iph/Makefile.in       |    3 +-
 src/libcharon/plugins/kernel_iph/kernel_iph_net.c  |    4 +-
 .../plugins/kernel_iph/kernel_iph_plugin.c         |    2 -
 src/libcharon/plugins/kernel_libipsec/Makefile.am  |    1 -
 src/libcharon/plugins/kernel_libipsec/Makefile.in  |    3 +-
 .../kernel_libipsec/kernel_libipsec_ipsec.c        |   63 +-
 .../kernel_libipsec/kernel_libipsec_router.c       |    7 +-
 src/libcharon/plugins/kernel_netlink/Makefile.am   |   44 +
 src/libcharon/plugins/kernel_netlink/Makefile.in   | 1007 +++++++
 .../plugins/kernel_netlink/kernel_netlink_ipsec.c  | 2975 +++++++++++++++++++
 .../plugins/kernel_netlink/kernel_netlink_ipsec.h  |    0
 .../plugins/kernel_netlink/kernel_netlink_net.c    | 2686 +++++++++++++++++
 .../plugins/kernel_netlink/kernel_netlink_net.h    |    0
 .../plugins/kernel_netlink/kernel_netlink_plugin.c |   85 +
 .../plugins/kernel_netlink/kernel_netlink_plugin.h |   42 +
 .../plugins/kernel_netlink/kernel_netlink_shared.c |    0
 .../plugins/kernel_netlink/kernel_netlink_shared.h |  104 +
 .../plugins/kernel_netlink/suites/test_socket.c    |    0
 src/libcharon/plugins/kernel_netlink/tests.c       |   47 +
 .../plugins/kernel_netlink/tests.h                 |    0
 src/libcharon/plugins/kernel_pfkey/Makefile.am     |   19 +
 src/libcharon/plugins/kernel_pfkey/Makefile.in     |  782 +++++
 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.c      | 3094 +++++++++++++++++++
 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.h      |    0
 .../plugins/kernel_pfkey/kernel_pfkey_plugin.c     |   80 +
 .../plugins/kernel_pfkey/kernel_pfkey_plugin.h     |   42 +
 src/libcharon/plugins/kernel_pfroute/Makefile.am   |   19 +
 src/libcharon/plugins/kernel_pfroute/Makefile.in   |  782 +++++
 .../plugins/kernel_pfroute/kernel_pfroute_net.c    | 1902 ++++++++++++
 .../plugins/kernel_pfroute/kernel_pfroute_net.h    |    0
 .../plugins/kernel_pfroute/kernel_pfroute_plugin.c |   74 +
 .../plugins/kernel_pfroute/kernel_pfroute_plugin.h |   42 +
 src/libcharon/plugins/kernel_wfp/Makefile.am       |    1 -
 src/libcharon/plugins/kernel_wfp/Makefile.in       |    3 +-
 .../plugins/kernel_wfp/kernel_wfp_ipsec.c          |   25 +-
 src/libcharon/plugins/led/Makefile.am              |    1 -
 src/libcharon/plugins/led/Makefile.in              |    3 +-
 src/libcharon/plugins/load_tester/Makefile.am      |    1 -
 src/libcharon/plugins/load_tester/Makefile.in      |    3 +-
 .../plugins/load_tester/load_tester_config.c       |   13 +-
 .../plugins/load_tester/load_tester_plugin.c       |   22 +-
 src/libcharon/plugins/lookip/Makefile.am           |    1 -
 src/libcharon/plugins/lookip/Makefile.in           |    3 +-
 src/libcharon/plugins/maemo/Makefile.am            |    1 -
 src/libcharon/plugins/maemo/Makefile.in            |    3 +-
 src/libcharon/plugins/medcli/Makefile.am           |    1 -
 src/libcharon/plugins/medcli/Makefile.in           |    3 +-
 src/libcharon/plugins/medsrv/Makefile.am           |    1 -
 src/libcharon/plugins/medsrv/Makefile.in           |    3 +-
 src/libcharon/plugins/osx_attr/Makefile.am         |    1 -
 src/libcharon/plugins/osx_attr/Makefile.in         |    3 +-
 src/libcharon/plugins/p_cscf/Makefile.am           |   19 +
 src/libcharon/plugins/p_cscf/Makefile.in           |  782 +++++
 src/libcharon/plugins/p_cscf/p_cscf_handler.c      |  173 ++
 src/libcharon/plugins/p_cscf/p_cscf_handler.h      |   49 +
 src/libcharon/plugins/p_cscf/p_cscf_plugin.c       |  101 +
 src/libcharon/plugins/p_cscf/p_cscf_plugin.h       |   43 +
 src/libcharon/plugins/radattr/Makefile.am          |    1 -
 src/libcharon/plugins/radattr/Makefile.in          |    3 +-
 src/libcharon/plugins/resolve/Makefile.am          |    1 -
 src/libcharon/plugins/resolve/Makefile.in          |    3 +-
 src/libcharon/plugins/resolve/resolve_handler.c    |    1 -
 src/libcharon/plugins/smp/Makefile.am              |    1 -
 src/libcharon/plugins/smp/Makefile.in              |    3 +-
 src/libcharon/plugins/smp/smp.c                    |    8 +-
 src/libcharon/plugins/socket_default/Makefile.am   |    1 -
 src/libcharon/plugins/socket_default/Makefile.in   |    3 +-
 .../plugins/socket_default/socket_default_socket.c |    8 +-
 src/libcharon/plugins/socket_dynamic/Makefile.am   |    1 -
 src/libcharon/plugins/socket_dynamic/Makefile.in   |    3 +-
 .../plugins/socket_dynamic/socket_dynamic_socket.c |    7 +-
 src/libcharon/plugins/socket_win/Makefile.am       |    1 -
 src/libcharon/plugins/socket_win/Makefile.in       |    3 +-
 .../plugins/socket_win/socket_win_socket.c         |    7 +-
 src/libcharon/plugins/sql/Makefile.am              |    1 -
 src/libcharon/plugins/sql/Makefile.in              |    3 +-
 src/libcharon/plugins/stroke/Makefile.am           |    1 -
 src/libcharon/plugins/stroke/Makefile.in           |    3 +-
 src/libcharon/plugins/stroke/stroke_config.c       |  123 +-
 src/libcharon/plugins/stroke/stroke_control.c      |    1 -
 src/libcharon/plugins/stroke/stroke_list.c         |  619 +---
 src/libcharon/plugins/stroke/stroke_socket.c       |   13 +-
 src/libcharon/plugins/systime_fix/Makefile.am      |    1 -
 src/libcharon/plugins/systime_fix/Makefile.in      |    3 +-
 src/libcharon/plugins/tnc_ifmap/Makefile.am        |    1 -
 src/libcharon/plugins/tnc_ifmap/Makefile.in        |    3 +-
 .../plugins/tnc_ifmap/tnc_ifmap_listener.c         |    5 +-
 src/libcharon/plugins/tnc_pdp/Makefile.am          |    1 -
 src/libcharon/plugins/tnc_pdp/Makefile.in          |    3 +-
 src/libcharon/plugins/uci/Makefile.am              |    1 -
 src/libcharon/plugins/uci/Makefile.in              |    3 +-
 src/libcharon/plugins/unity/Makefile.am            |    1 -
 src/libcharon/plugins/unity/Makefile.in            |    3 +-
 src/libcharon/plugins/updown/Makefile.am           |    1 -
 src/libcharon/plugins/updown/Makefile.in           |    3 +-
 src/libcharon/plugins/updown/updown_listener.c     |   70 +-
 src/libcharon/plugins/vici/Makefile.am             |    8 +-
 src/libcharon/plugins/vici/Makefile.in             |   22 +-
 src/libcharon/plugins/vici/README.md               |   98 +-
 src/libcharon/plugins/vici/perl/Makefile.am        |   27 +
 src/libcharon/plugins/vici/perl/Makefile.in        |  567 ++++
 .../plugins/vici/perl/Vici-Session/Changes         |    6 +
 .../plugins/vici/perl/Vici-Session/MANIFEST        |    9 +
 .../plugins/vici/perl/Vici-Session/Makefile.PL     |   11 +
 .../plugins/vici/perl/Vici-Session/README.pod      |  649 ++++
 .../vici/perl/Vici-Session/lib/Vici/Message.pm     |  256 ++
 .../vici/perl/Vici-Session/lib/Vici/Packet.pm      |  191 ++
 .../vici/perl/Vici-Session/lib/Vici/Session.pm     |  204 ++
 .../vici/perl/Vici-Session/lib/Vici/Transport.pm   |   88 +
 .../vici/perl/Vici-Session/t/Vici-Session.t        |   18 +
 src/libcharon/plugins/vici/python/Makefile.in      |    2 +
 src/libcharon/plugins/vici/python/vici/session.py  |    8 +
 src/libcharon/plugins/vici/ruby/Makefile.in        |    2 +
 src/libcharon/plugins/vici/ruby/lib/vici.rb        |    6 +
 src/libcharon/plugins/vici/vici_cert_info.c        |   57 +
 src/libcharon/plugins/vici/vici_cert_info.h        |   32 +
 src/libcharon/plugins/vici/vici_config.c           |  359 ++-
 src/libcharon/plugins/vici/vici_config.h           |    5 +-
 src/libcharon/plugins/vici/vici_control.c          |  187 +-
 src/libcharon/plugins/vici/vici_cred.c             |   69 +-
 src/libcharon/plugins/vici/vici_plugin.c           |    3 +-
 src/libcharon/plugins/vici/vici_query.c            |  374 ++-
 src/libcharon/plugins/vici/vici_tests.c            |    1 -
 src/libcharon/plugins/whitelist/Makefile.am        |    1 -
 src/libcharon/plugins/whitelist/Makefile.in        |    3 +-
 src/libcharon/plugins/xauth_eap/Makefile.am        |    1 -
 src/libcharon/plugins/xauth_eap/Makefile.in        |    3 +-
 src/libcharon/plugins/xauth_generic/Makefile.am    |    1 -
 src/libcharon/plugins/xauth_generic/Makefile.in    |    3 +-
 src/libcharon/plugins/xauth_noauth/Makefile.am     |    1 -
 src/libcharon/plugins/xauth_noauth/Makefile.in     |    3 +-
 src/libcharon/plugins/xauth_pam/Makefile.am        |    1 -
 src/libcharon/plugins/xauth_pam/Makefile.in        |    3 +-
 src/libcharon/processing/jobs/adopt_children_job.c |    1 -
 src/libcharon/processing/jobs/redirect_job.c       |  106 +
 src/libcharon/processing/jobs/redirect_job.h       |   51 +
 src/libcharon/processing/jobs/send_keepalive_job.c |    2 +-
 src/libcharon/sa/child_sa.c                        |   82 +-
 src/libcharon/sa/ike_sa.c                          |  557 +++-
 src/libcharon/sa/ike_sa.h                          |   65 +-
 src/libcharon/sa/ike_sa_manager.c                  |   97 +-
 .../ikev1/authenticators/pubkey_v1_authenticator.c |    4 +-
 src/libcharon/sa/ikev1/phase1.c                    |    2 +-
 src/libcharon/sa/ikev1/tasks/isakmp_natd.c         |    3 +-
 src/libcharon/sa/ikev1/tasks/mode_config.c         |   37 +-
 src/libcharon/sa/ikev1/tasks/quick_mode.c          |   18 +-
 src/libcharon/sa/ikev1/tasks/xauth.c               |    1 -
 .../sa/ikev2/authenticators/pubkey_authenticator.c |   23 +-
 src/libcharon/sa/ikev2/task_manager_v2.c           |  102 +-
 src/libcharon/sa/ikev2/tasks/child_create.c        |    7 +-
 src/libcharon/sa/ikev2/tasks/child_rekey.c         |   11 +-
 src/libcharon/sa/ikev2/tasks/ike_auth.c            |  144 +-
 src/libcharon/sa/ikev2/tasks/ike_config.c          |    5 +
 src/libcharon/sa/ikev2/tasks/ike_init.c            |  146 +-
 src/libcharon/sa/ikev2/tasks/ike_me.c              |    5 +-
 src/libcharon/sa/ikev2/tasks/ike_mobike.c          |   13 +-
 src/libcharon/sa/ikev2/tasks/ike_natd.c            |    9 +-
 src/libcharon/sa/ikev2/tasks/ike_redirect.c        |  150 +
 src/libcharon/sa/ikev2/tasks/ike_redirect.h        |   54 +
 src/libcharon/sa/ikev2/tasks/ike_vendor.c          |   56 +-
 .../sa/ikev2/tasks/ike_verify_peer_cert.c          |  117 +
 .../sa/ikev2/tasks/ike_verify_peer_cert.h          |   54 +
 src/libcharon/sa/redirect_manager.c                |  274 ++
 src/libcharon/sa/redirect_manager.h                |  109 +
 src/libcharon/sa/redirect_provider.h               |   59 +
 src/libcharon/sa/shunt_manager.c                   |   25 +-
 src/libcharon/sa/task.c                            |    2 +
 src/libcharon/sa/task.h                            |   18 +-
 src/libcharon/sa/trap_manager.c                    |    4 +-
 src/libcharon/tests/Makefile.am                    |    2 -
 src/libcharon/tests/Makefile.in                    |    5 +-
 src/libcharon/tests/libcharon_tests.c              |    3 -
 src/libfast/Makefile.in                            |    2 +
 src/libhydra/Android.mk                            |   37 -
 src/libhydra/Makefile.am                           |   60 -
 src/libhydra/Makefile.in                           |  922 ------
 src/libhydra/hydra.c                               |   93 -
 src/libhydra/hydra.h                               |   71 -
 src/libhydra/kernel/kernel_interface.c             | 1086 -------
 src/libhydra/kernel/kernel_interface.h             |  655 -----
 src/libhydra/kernel/kernel_ipsec.c                 |   38 -
 src/libhydra/kernel/kernel_ipsec.h                 |  297 --
 src/libhydra/kernel/kernel_listener.h              |  107 -
 src/libhydra/kernel/kernel_net.c                   |   38 -
 src/libhydra/kernel/kernel_net.h                   |  196 --
 src/libhydra/plugins/kernel_netlink/Makefile.am    |   44 -
 src/libhydra/plugins/kernel_netlink/Makefile.in    | 1005 -------
 .../plugins/kernel_netlink/kernel_netlink_ipsec.c  | 2966 -------------------
 .../plugins/kernel_netlink/kernel_netlink_net.c    | 2685 -----------------
 .../plugins/kernel_netlink/kernel_netlink_plugin.c |   87 -
 .../plugins/kernel_netlink/kernel_netlink_plugin.h |   42 -
 .../plugins/kernel_netlink/kernel_netlink_shared.h |   96 -
 src/libhydra/plugins/kernel_netlink/tests.c        |   49 -
 src/libhydra/plugins/kernel_pfkey/Makefile.am      |   19 -
 src/libhydra/plugins/kernel_pfkey/Makefile.in      |  780 -----
 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.c      | 3102 --------------------
 .../plugins/kernel_pfkey/kernel_pfkey_plugin.c     |   82 -
 .../plugins/kernel_pfkey/kernel_pfkey_plugin.h     |   42 -
 src/libhydra/plugins/kernel_pfroute/Makefile.am    |   19 -
 src/libhydra/plugins/kernel_pfroute/Makefile.in    |  780 -----
 .../plugins/kernel_pfroute/kernel_pfroute_net.c    | 1903 ------------
 .../plugins/kernel_pfroute/kernel_pfroute_plugin.c |   76 -
 .../plugins/kernel_pfroute/kernel_pfroute_plugin.h |   42 -
 src/libhydra/tests/Makefile.am                     |   18 -
 src/libhydra/tests/Makefile.in                     |  839 ------
 src/libhydra/tests/hydra_tests.c                   |   53 -
 src/libhydra/tests/hydra_tests.h                   |   14 -
 src/libimcv/Makefile.in                            |    2 +
 src/libimcv/imc/imc_os_info.c                      |   12 +-
 src/libimcv/plugins/imc_attestation/Makefile.in    |    2 +
 src/libimcv/plugins/imc_hcd/Makefile.in            |    2 +
 src/libimcv/plugins/imc_os/Makefile.in             |    2 +
 src/libimcv/plugins/imc_scanner/Makefile.in        |    2 +
 src/libimcv/plugins/imc_swid/Makefile.in           |    2 +
 src/libimcv/plugins/imc_test/Makefile.in           |    2 +
 src/libimcv/plugins/imv_attestation/Makefile.in    |    2 +
 .../imv_attestation/imv_attestation_agent.c        |    6 +-
 .../imv_attestation/imv_attestation_state.h        |    2 +-
 src/libimcv/plugins/imv_hcd/Makefile.in            |    2 +
 src/libimcv/plugins/imv_os/Makefile.in             |    2 +
 src/libimcv/plugins/imv_scanner/Makefile.in        |    2 +
 src/libimcv/plugins/imv_swid/Makefile.in           |    2 +
 src/libimcv/plugins/imv_swid/imv_swid_agent.c      |   11 +-
 src/libimcv/plugins/imv_swid/imv_swid_state.c      |   19 +-
 src/libimcv/plugins/imv_swid/imv_swid_state.h      |   37 +-
 src/libimcv/plugins/imv_test/Makefile.in           |    2 +
 src/libimcv/pts/components/pts_component_manager.h |    4 +-
 src/libipsec/Makefile.in                           |    2 +
 src/libipsec/ipsec_policy_mgr.c                    |   11 +-
 src/libipsec/ipsec_policy_mgr.h                    |   11 +-
 src/libipsec/tests/Makefile.in                     |    2 +
 src/libpttls/Makefile.in                           |    2 +
 src/libradius/Makefile.in                          |    2 +
 src/libsimaka/Makefile.am                          |    1 -
 src/libsimaka/Makefile.in                          |    3 +-
 src/libstrongswan/Android.mk                       |    3 +-
 src/libstrongswan/Makefile.am                      |    4 +-
 src/libstrongswan/Makefile.in                      |   18 +
 src/libstrongswan/asn1/asn1.h                      |    1 +
 src/libstrongswan/asn1/oid.c                       |  889 +++---
 src/libstrongswan/asn1/oid.h                       |  429 +--
 src/libstrongswan/asn1/oid.txt                     |    1 +
 src/libstrongswan/collections/array.c              |   10 +
 src/libstrongswan/collections/array.h              |   15 +
 src/libstrongswan/collections/linked_list.c        |   54 +-
 src/libstrongswan/collections/linked_list.h        |   23 +-
 src/libstrongswan/credentials/auth_cfg.c           |  248 +-
 src/libstrongswan/credentials/auth_cfg.h           |   13 +
 .../credentials/certificates/certificate.c         |    9 +-
 .../credentials/certificates/certificate_printer.c |  753 +++++
 .../credentials/certificates/certificate_printer.h |   70 +
 .../credentials/certificates/ocsp_response.h       |    7 +
 src/libstrongswan/credentials/certificates/x509.c  |   27 +
 src/libstrongswan/credentials/certificates/x509.h  |    4 +
 src/libstrongswan/credentials/credential_manager.c |    8 +-
 src/libstrongswan/credentials/credential_manager.h |    7 +-
 src/libstrongswan/library.c                        |   33 +-
 src/libstrongswan/library.h                        |   12 +-
 src/libstrongswan/plugins/acert/Makefile.in        |    2 +
 src/libstrongswan/plugins/aes/Makefile.in          |    2 +
 src/libstrongswan/plugins/aesni/Makefile.in        |    2 +
 src/libstrongswan/plugins/af_alg/Makefile.in       |    2 +
 src/libstrongswan/plugins/agent/Makefile.in        |    2 +
 src/libstrongswan/plugins/bliss/Makefile.in        |    2 +
 src/libstrongswan/plugins/bliss/tests/Makefile.in  |    2 +
 src/libstrongswan/plugins/blowfish/Makefile.in     |    2 +
 src/libstrongswan/plugins/ccm/Makefile.in          |    2 +
 src/libstrongswan/plugins/chapoly/Makefile.in      |    2 +
 .../plugins/chapoly/chapoly_drv_portable.c         |   21 -
 src/libstrongswan/plugins/cmac/Makefile.in         |    2 +
 src/libstrongswan/plugins/constraints/Makefile.in  |    2 +
 src/libstrongswan/plugins/ctr/Makefile.in          |    2 +
 src/libstrongswan/plugins/curl/Makefile.in         |    2 +
 src/libstrongswan/plugins/des/Makefile.in          |    2 +
 src/libstrongswan/plugins/dnskey/Makefile.in       |    2 +
 src/libstrongswan/plugins/files/Makefile.in        |    2 +
 src/libstrongswan/plugins/fips_prf/Makefile.in     |    2 +
 src/libstrongswan/plugins/gcm/Makefile.in          |    2 +
 src/libstrongswan/plugins/gcrypt/Makefile.in       |    2 +
 src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c   |    8 +-
 src/libstrongswan/plugins/gmp/Makefile.in          |    2 +
 src/libstrongswan/plugins/gmp/gmp_plugin.c         |   16 +-
 src/libstrongswan/plugins/hmac/Makefile.in         |    2 +
 src/libstrongswan/plugins/keychain/Makefile.in     |    2 +
 src/libstrongswan/plugins/ldap/Makefile.in         |    2 +
 src/libstrongswan/plugins/md4/Makefile.in          |    2 +
 src/libstrongswan/plugins/md5/Makefile.in          |    2 +
 src/libstrongswan/plugins/mysql/Makefile.in        |    2 +
 src/libstrongswan/plugins/nonce/Makefile.in        |    2 +
 src/libstrongswan/plugins/ntru/Makefile.in         |    2 +
 src/libstrongswan/plugins/openssl/Makefile.in      |    2 +
 src/libstrongswan/plugins/openssl/openssl_plugin.c |   46 +-
 src/libstrongswan/plugins/padlock/Makefile.in      |    2 +
 src/libstrongswan/plugins/pem/Makefile.in          |    2 +
 src/libstrongswan/plugins/pgp/Makefile.in          |    2 +
 src/libstrongswan/plugins/pkcs1/Makefile.in        |    2 +
 src/libstrongswan/plugins/pkcs11/Makefile.in       |    2 +
 src/libstrongswan/plugins/pkcs12/Makefile.in       |    2 +
 src/libstrongswan/plugins/pkcs7/Makefile.in        |    2 +
 src/libstrongswan/plugins/pkcs8/Makefile.in        |    2 +
 src/libstrongswan/plugins/pubkey/Makefile.in       |    2 +
 src/libstrongswan/plugins/pubkey/pubkey_cert.c     |    8 +
 src/libstrongswan/plugins/pubkey/pubkey_cert.h     |    7 +
 src/libstrongswan/plugins/random/Makefile.in       |    2 +
 src/libstrongswan/plugins/rc2/Makefile.in          |    2 +
 src/libstrongswan/plugins/rdrand/Makefile.in       |    2 +
 src/libstrongswan/plugins/revocation/Makefile.in   |    2 +
 src/libstrongswan/plugins/sha1/Makefile.in         |    2 +
 src/libstrongswan/plugins/sha2/Makefile.in         |    2 +
 src/libstrongswan/plugins/sha3/Makefile.in         |    2 +
 src/libstrongswan/plugins/soup/Makefile.in         |    2 +
 src/libstrongswan/plugins/sqlite/Makefile.in       |    2 +
 src/libstrongswan/plugins/sshkey/Makefile.in       |    2 +
 src/libstrongswan/plugins/test_vectors/Makefile.in |    2 +
 src/libstrongswan/plugins/unbound/Makefile.in      |    2 +
 src/libstrongswan/plugins/winhttp/Makefile.in      |    2 +
 src/libstrongswan/plugins/x509/Makefile.in         |    2 +
 src/libstrongswan/plugins/x509/x509_cert.c         |    4 +-
 .../plugins/x509/x509_ocsp_response.c              |   42 +-
 src/libstrongswan/plugins/xcbc/Makefile.in         |    2 +
 src/libstrongswan/processing/watcher.c             |    7 +
 src/libstrongswan/tests/Makefile.am                |    1 +
 src/libstrongswan/tests/Makefile.in                |   21 +
 src/libstrongswan/tests/suites/test_array.c        |   43 +
 src/libstrongswan/tests/suites/test_auth_cfg.c     |  122 +
 .../tests/suites/test_identification.c             |  261 +-
 src/libstrongswan/tests/suites/test_linked_list.c  |   91 +
 src/libstrongswan/tests/tests.h                    |    1 +
 src/libstrongswan/threading/thread.c               |   34 +-
 src/libstrongswan/threading/thread.h               |    8 +-
 src/libstrongswan/threading/windows/thread.c       |    4 +
 src/libstrongswan/utils/compat/windows.c           |    1 -
 src/libstrongswan/utils/debug.c                    |    6 +-
 src/libstrongswan/utils/identification.c           |  389 ++-
 src/libstrongswan/utils/identification.h           |    2 +
 src/libstrongswan/utils/utils/byteorder.h          |   78 +-
 src/libtls/Makefile.in                             |    2 +
 src/libtls/tests/Makefile.in                       |    2 +
 src/libtls/tls_peer.c                              |    3 +-
 src/libtls/tls_server.c                            |    2 +-
 src/libtnccs/Makefile.in                           |    2 +
 src/libtnccs/plugins/tnc_imc/Makefile.in           |    2 +
 src/libtnccs/plugins/tnc_imv/Makefile.in           |    2 +
 src/libtnccs/plugins/tnc_tnccs/Makefile.in         |    2 +
 src/libtnccs/plugins/tnccs_11/Makefile.in          |    2 +
 src/libtnccs/plugins/tnccs_20/Makefile.in          |    2 +
 src/libtnccs/plugins/tnccs_20/tnccs_20.c           |   38 +-
 src/libtnccs/plugins/tnccs_dynamic/Makefile.in     |    2 +
 src/libtncif/Makefile.in                           |    2 +
 src/manager/Makefile.in                            |    2 +
 src/medsrv/Makefile.in                             |    2 +
 src/pki/Makefile.am                                |    5 +-
 src/pki/Makefile.in                                |   12 +-
 src/pki/command.c                                  |   11 +-
 src/pki/command.h                                  |    2 +-
 src/pki/commands/print.c                           |  543 +---
 src/pki/man/Makefile.in                            |    2 +
 src/pool/Makefile.am                               |    2 -
 src/pool/Makefile.in                               |    5 +-
 src/pt-tls-client/Makefile.in                      |    2 +
 src/scepclient/Makefile.am                         |    1 -
 src/scepclient/Makefile.in                         |    3 +-
 src/starter/Android.mk                             |    3 +-
 src/starter/Makefile.am                            |    4 +-
 src/starter/Makefile.in                            |    8 +-
 src/starter/confread.c                             |    4 +-
 src/starter/netkey.c                               |    1 -
 src/starter/starter.c                              |    4 -
 src/starter/tests/Makefile.in                      |    2 +
 src/stroke/Makefile.in                             |    2 +
 src/stroke/stroke.c                                |   13 +-
 src/swanctl/Makefile.am                            |    8 +-
 src/swanctl/Makefile.in                            |   28 +-
 src/swanctl/command.c                              |   11 +-
 src/swanctl/command.h                              |    4 +-
 src/swanctl/commands/list_algs.c                   |  104 +
 src/swanctl/commands/list_certs.c                  |  603 +---
 src/swanctl/commands/list_sas.c                    |   13 +-
 src/swanctl/commands/load_conns.c                  |    9 +-
 src/swanctl/commands/load_creds.c                  |   47 +-
 src/swanctl/commands/redirect.c                    |  132 +
 src/swanctl/commands/stats.c                       |   12 +
 src/swanctl/swanctl.8.in                           |    9 +-
 src/swanctl/swanctl.conf                           |   22 +-
 src/swanctl/swanctl.conf.5.main                    |  139 +-
 src/swanctl/swanctl.h                              |   18 +
 src/swanctl/swanctl.opt                            |   99 +-
 testing/Makefile.in                                |    2 +
 testing/do-tests                                   |   31 +-
 testing/hosts/alice/etc/ipsec.d/ipsec.sql          |    4 +-
 testing/hosts/bob/etc/ipsec.d/ipsec.sql            |    4 +-
 testing/hosts/carol/etc/ipsec.d/ipsec.sql          |    4 +-
 testing/hosts/dave/etc/ipsec.d/ipsec.sql           |    4 +-
 .../hosts/default/usr/local/bin/expect-connection  |    8 +-
 testing/hosts/moon/etc/ipsec.d/ipsec.sql           |    4 +-
 testing/hosts/sun/etc/ipsec.d/ipsec.sql            |    4 +-
 testing/hosts/venus/etc/ipsec.d/ipsec.sql          |    4 +-
 testing/hosts/winnetou/etc/openssl/generate-crl    |    3 +
 testing/scripts/recipes/013_strongswan.mk          |    1 -
 testing/tests/af-alg/alg-camellia/description.txt  |    5 +-
 testing/tests/af-alg/alg-camellia/evaltest.dat     |    8 +-
 .../af-alg/alg-camellia/hosts/carol/etc/ipsec.conf |   22 -
 .../alg-camellia/hosts/carol/etc/strongswan.conf   |    7 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   27 +
 .../af-alg/alg-camellia/hosts/moon/etc/ipsec.conf  |   21 -
 .../alg-camellia/hosts/moon/etc/strongswan.conf    |    7 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   25 +
 testing/tests/af-alg/alg-camellia/posttest.dat     |    5 +-
 testing/tests/af-alg/alg-camellia/pretest.dat      |    7 +-
 testing/tests/af-alg/alg-camellia/test.conf        |    4 +
 testing/tests/af-alg/rw-cert/description.txt       |    4 +-
 testing/tests/af-alg/rw-cert/evaltest.dat          |   13 +-
 .../af-alg/rw-cert/hosts/carol/etc/ipsec.conf      |   22 -
 .../af-alg/rw-cert/hosts/carol/etc/strongswan.conf |    7 +-
 .../rw-cert/hosts/carol/etc/swanctl/swanctl.conf   |   27 +
 .../tests/af-alg/rw-cert/hosts/dave/etc/ipsec.conf |   22 -
 .../af-alg/rw-cert/hosts/dave/etc/strongswan.conf  |    8 +-
 .../rw-cert/hosts/dave/etc/swanctl/swanctl.conf    |   27 +
 .../tests/af-alg/rw-cert/hosts/moon/etc/ipsec.conf |   21 -
 .../af-alg/rw-cert/hosts/moon/etc/strongswan.conf  |    7 +-
 .../rw-cert/hosts/moon/etc/swanctl/swanctl.conf    |   25 +
 testing/tests/af-alg/rw-cert/posttest.dat          |    8 +-
 testing/tests/af-alg/rw-cert/pretest.dat           |   14 +-
 testing/tests/af-alg/rw-cert/test.conf             |    4 +
 .../tests/gcrypt-ikev2/alg-camellia/evaltest.dat   |    4 +-
 .../alg-camellia/hosts/carol/etc/ipsec.conf        |    2 +-
 .../alg-camellia/hosts/moon/etc/ipsec.conf         |    2 +-
 testing/tests/gcrypt-ikev2/rw-cert/pretest.dat     |    1 +
 testing/tests/ha/active-passive/pretest.dat        |    1 -
 testing/tests/ikev1/alg-3des-md5/evaltest.dat      |    4 +-
 testing/tests/ikev1/alg-sha256/evaltest.dat        |    8 +-
 .../ikev1/alg-sha256/hosts/carol/etc/ipsec.conf    |    4 +-
 .../ikev1/alg-sha256/hosts/moon/etc/ipsec.conf     |    4 +-
 testing/tests/ikev1/alg-sha384/evaltest.dat        |    4 +-
 testing/tests/ikev1/alg-sha512/evaltest.dat        |    4 +-
 .../ip-pool-db/hosts/moon/etc/strongswan.conf      |    2 -
 .../ikev1/xauth-rsa-eap-md5-radius/evaltest.dat    |    2 +-
 testing/tests/ikev1/xauth-rsa-radius/evaltest.dat  |    2 +-
 testing/tests/ikev2/alg-aes-xcbc/evaltest.dat      |    4 +-
 .../ikev2/alg-aes-xcbc/hosts/carol/etc/ipsec.conf  |    4 +-
 .../ikev2/alg-aes-xcbc/hosts/moon/etc/ipsec.conf   |    4 +-
 testing/tests/ikev2/alg-sha256-96/evaltest.dat     |    4 +-
 .../ikev2/alg-sha256-96/hosts/carol/etc/ipsec.conf |    4 +-
 .../ikev2/alg-sha256-96/hosts/moon/etc/ipsec.conf  |    4 +-
 testing/tests/ikev2/alg-sha256/evaltest.dat        |    4 +-
 .../ikev2/alg-sha256/hosts/carol/etc/ipsec.conf    |    4 +-
 .../ikev2/alg-sha256/hosts/moon/etc/ipsec.conf     |    4 +-
 .../ip-pool-db/hosts/moon/etc/strongswan.conf      |    2 -
 .../hosts/moon/etc/strongswan.conf                 |    2 -
 .../ip-two-pools-db/hosts/moon/etc/strongswan.conf |    2 -
 .../hosts/moon/etc/strongswan.conf                 |    2 -
 .../hosts/moon/etc/strongswan.conf                 |    2 -
 testing/tests/ikev2/ip-two-pools/pretest.dat       |    2 +-
 .../tests/ikev2/reauth-mbb-revoked/description.txt |   15 +
 .../tests/ikev2/reauth-mbb-revoked/evaltest.dat    |   10 +
 .../reauth-mbb-revoked/hosts/carol/etc/ipsec.conf  |   21 +
 .../hosts/carol/etc/strongswan.conf                |    7 +
 .../reauth-mbb-revoked/hosts/moon/etc/ipsec.conf   |   19 +
 .../hosts/moon/etc/strongswan.conf                 |    5 +
 .../tests/ikev2/reauth-mbb-revoked/posttest.dat    |    3 +
 testing/tests/ikev2/reauth-mbb-revoked/pretest.dat |    4 +
 .../reauth-mbb-revoked}/test.conf                  |    0
 .../tests/ikev2/redirect-active/description.txt    |    8 +
 testing/tests/ikev2/redirect-active/evaltest.dat   |   28 +
 .../redirect-active/hosts/alice/etc/ipsec.conf     |   19 +
 .../hosts/alice/etc/ipsec.d/certs/marsCert.pem     |   25 +
 .../hosts/alice/etc/ipsec.d/private/marsKey.pem    |   27 +
 .../redirect-active/hosts/alice/etc/ipsec.secrets  |    3 +
 .../redirect-active/hosts/alice/etc/iptables.rules |   34 +
 .../hosts/alice/etc/strongswan.conf                |    6 +
 .../redirect-active/hosts/carol/etc/ipsec.conf     |   19 +
 .../hosts/carol/etc/strongswan.conf                |    5 +
 .../redirect-active/hosts/dave/etc/ipsec.conf      |   19 +
 .../redirect-active/hosts/dave/etc/strongswan.conf |    6 +
 .../redirect-active/hosts/moon/etc/ipsec.conf      |   18 +
 .../hosts/moon/etc/ipsec.d/certs/marsCert.pem      |   25 +
 .../hosts/moon/etc/ipsec.d/private/marsKey.pem     |   27 +
 .../redirect-active/hosts/moon/etc/ipsec.secrets   |    3 +
 .../redirect-active/hosts/moon/etc/strongswan.conf |    6 +
 testing/tests/ikev2/redirect-active/posttest.dat   |   10 +
 testing/tests/ikev2/redirect-active/pretest.dat    |   13 +
 testing/tests/ikev2/redirect-active/test.conf      |   21 +
 testing/tests/ikev2/rw-dnssec/pretest.dat          |    2 +-
 testing/tests/ikev2/trap-any/evaltest.dat          |   10 +-
 testing/tests/libipsec/net2net-null/evaltest.dat   |    4 +-
 .../net2net-null/hosts/moon/etc/ipsec.conf         |    4 +-
 .../libipsec/net2net-null/hosts/sun/etc/ipsec.conf |    4 +-
 .../tests/openssl-ikev1/alg-camellia/evaltest.dat  |   12 +-
 .../alg-camellia/hosts/carol/etc/ipsec.conf        |    4 +-
 .../alg-camellia/hosts/moon/etc/ipsec.conf         |    4 +-
 .../tests/openssl-ikev1/ecdsa-certs/evaltest.dat   |    8 +-
 .../tests/openssl-ikev2/alg-camellia/evaltest.dat  |   12 +-
 .../alg-camellia/hosts/carol/etc/ipsec.conf        |    4 +-
 .../alg-camellia/hosts/moon/etc/ipsec.conf         |    4 +-
 testing/tests/pfkey/alg-aes-xcbc/evaltest.dat      |    4 +-
 .../pfkey/alg-aes-xcbc/hosts/carol/etc/ipsec.conf  |    4 +-
 .../pfkey/alg-aes-xcbc/hosts/moon/etc/ipsec.conf   |    4 +-
 testing/tests/sql/ip-pool-db-expired/evaltest.dat  |   12 +-
 .../hosts/carol/etc/ipsec.d/data.sql               |    2 +-
 .../hosts/carol/etc/strongswan.conf                |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../hosts/dave/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/dave/etc/strongswan.conf                 |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/moon/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/moon/etc/strongswan.conf                 |    8 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/ip-pool-db-expired/posttest.dat  |    8 +-
 testing/tests/sql/ip-pool-db-expired/pretest.dat   |   14 +-
 testing/tests/sql/ip-pool-db-expired/test.conf     |    4 +
 testing/tests/sql/ip-pool-db-restart/evaltest.dat  |   12 +-
 .../hosts/carol/etc/ipsec.d/data.sql               |    2 +-
 .../hosts/carol/etc/strongswan.conf                |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../hosts/dave/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/dave/etc/strongswan.conf                 |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/moon/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/moon/etc/strongswan.conf                 |    8 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/ip-pool-db-restart/posttest.dat  |    8 +-
 testing/tests/sql/ip-pool-db-restart/pretest.dat   |   14 +-
 testing/tests/sql/ip-pool-db-restart/test.conf     |    4 +
 testing/tests/sql/ip-pool-db/evaltest.dat          |   12 +-
 .../ip-pool-db/hosts/carol/etc/ipsec.d/data.sql    |    2 +-
 .../sql/ip-pool-db/hosts/carol/etc/strongswan.conf |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../sql/ip-pool-db/hosts/dave/etc/ipsec.d/data.sql |    2 +-
 .../sql/ip-pool-db/hosts/dave/etc/strongswan.conf  |    2 +-
 .../ip-pool-db/hosts/dave/etc/swanctl/swanctl.conf |    1 +
 .../sql/ip-pool-db/hosts/moon/etc/ipsec.d/data.sql |    2 +-
 .../sql/ip-pool-db/hosts/moon/etc/strongswan.conf  |    8 +-
 .../ip-pool-db/hosts/moon/etc/swanctl/swanctl.conf |    1 +
 testing/tests/sql/ip-pool-db/posttest.dat          |   11 +-
 testing/tests/sql/ip-pool-db/pretest.dat           |   14 +-
 testing/tests/sql/ip-pool-db/test.conf             |    4 +
 .../sql/ip-split-pools-db-restart/evaltest.dat     |   12 +-
 .../hosts/carol/etc/ipsec.d/data.sql               |    2 +-
 .../hosts/carol/etc/strongswan.conf                |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../hosts/dave/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/dave/etc/strongswan.conf                 |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/moon/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/moon/etc/strongswan.conf                 |    8 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 .../sql/ip-split-pools-db-restart/posttest.dat     |    8 +-
 .../sql/ip-split-pools-db-restart/pretest.dat      |   14 +-
 .../tests/sql/ip-split-pools-db-restart/test.conf  |    4 +
 testing/tests/sql/ip-split-pools-db/evaltest.dat   |   11 +-
 .../hosts/carol/etc/ipsec.d/data.sql               |    2 +-
 .../hosts/carol/etc/strongswan.conf                |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../hosts/dave/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/dave/etc/strongswan.conf                 |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/moon/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/moon/etc/strongswan.conf                 |    8 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/ip-split-pools-db/posttest.dat   |    8 +-
 testing/tests/sql/ip-split-pools-db/pretest.dat    |   14 +-
 testing/tests/sql/ip-split-pools-db/test.conf      |    3 +
 testing/tests/sql/multi-level-ca/evaltest.dat      |   16 +-
 .../hosts/carol/etc/ipsec.d/data.sql               |    2 +-
 .../multi-level-ca/hosts/carol/etc/strongswan.conf |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../multi-level-ca/hosts/dave/etc/ipsec.d/data.sql |    2 +-
 .../multi-level-ca/hosts/dave/etc/strongswan.conf  |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../multi-level-ca/hosts/moon/etc/ipsec.d/data.sql |    2 +-
 .../multi-level-ca/hosts/moon/etc/strongswan.conf  |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/multi-level-ca/posttest.dat      |    8 +-
 testing/tests/sql/multi-level-ca/pretest.dat       |   14 +-
 testing/tests/sql/multi-level-ca/test.conf         |    4 +
 testing/tests/sql/net2net-cert/evaltest.dat        |    6 +-
 .../net2net-cert/hosts/moon/etc/ipsec.d/data.sql   |    2 +-
 .../net2net-cert/hosts/moon/etc/strongswan.conf    |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 .../net2net-cert/hosts/sun/etc/ipsec.d/data.sql    |    2 +-
 .../sql/net2net-cert/hosts/sun/etc/strongswan.conf |    2 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |    1 +
 testing/tests/sql/net2net-cert/posttest.dat        |    4 +-
 testing/tests/sql/net2net-cert/pretest.dat         |   11 +-
 testing/tests/sql/net2net-cert/test.conf           |    4 +
 testing/tests/sql/net2net-psk/evaltest.dat         |    6 +-
 .../net2net-psk/hosts/moon/etc/ipsec.d/data.sql    |    2 +-
 .../sql/net2net-psk/hosts/moon/etc/strongswan.conf |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 .../sql/net2net-psk/hosts/sun/etc/ipsec.d/data.sql |    2 +-
 .../sql/net2net-psk/hosts/sun/etc/strongswan.conf  |    2 +-
 .../net2net-psk/hosts/sun/etc/swanctl/swanctl.conf |    1 +
 testing/tests/sql/net2net-psk/posttest.dat         |    4 +-
 testing/tests/sql/net2net-psk/pretest.dat          |   11 +-
 testing/tests/sql/net2net-psk/test.conf            |    4 +
 testing/tests/sql/net2net-route-pem/evaltest.dat   |   12 +-
 .../hosts/moon/etc/ipsec.d/data.sql                |    6 +-
 .../hosts/moon/etc/strongswan.conf                 |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/sun/etc/ipsec.d/data.sql                 |    6 +-
 .../hosts/sun/etc/strongswan.conf                  |    2 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |    1 +
 testing/tests/sql/net2net-route-pem/posttest.dat   |    4 +-
 testing/tests/sql/net2net-route-pem/pretest.dat    |   10 +-
 testing/tests/sql/net2net-route-pem/test.conf      |    4 +
 testing/tests/sql/net2net-start-pem/evaltest.dat   |   10 +-
 .../hosts/moon/etc/ipsec.d/data.sql                |   14 +-
 .../hosts/moon/etc/strongswan.conf                 |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/sun/etc/ipsec.d/data.sql                 |   14 +-
 .../hosts/sun/etc/strongswan.conf                  |    2 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |    1 +
 testing/tests/sql/net2net-start-pem/posttest.dat   |    4 +-
 testing/tests/sql/net2net-start-pem/pretest.dat    |   10 +-
 testing/tests/sql/net2net-start-pem/test.conf      |    4 +
 testing/tests/sql/rw-cert/evaltest.dat             |   12 +-
 .../sql/rw-cert/hosts/carol/etc/ipsec.d/data.sql   |    2 +-
 .../sql/rw-cert/hosts/carol/etc/strongswan.conf    |    2 +-
 .../rw-cert/hosts/carol/etc/swanctl/swanctl.conf   |    1 +
 .../sql/rw-cert/hosts/dave/etc/ipsec.d/data.sql    |    2 +-
 .../sql/rw-cert/hosts/dave/etc/strongswan.conf     |    2 +-
 .../rw-cert/hosts/dave/etc/swanctl/swanctl.conf    |    1 +
 .../sql/rw-cert/hosts/moon/etc/ipsec.d/data.sql    |    2 +-
 .../sql/rw-cert/hosts/moon/etc/strongswan.conf     |    2 +-
 .../rw-cert/hosts/moon/etc/swanctl/swanctl.conf    |    1 +
 testing/tests/sql/rw-cert/posttest.dat             |    8 +-
 testing/tests/sql/rw-cert/pretest.dat              |   14 +-
 testing/tests/sql/rw-cert/test.conf                |    4 +
 testing/tests/sql/rw-eap-aka-rsa/evaltest.dat      |    8 +-
 .../hosts/carol/etc/ipsec.d/data.sql               |    2 +-
 .../rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql |    2 +-
 .../rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf  |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/rw-eap-aka-rsa/posttest.dat      |    5 +-
 testing/tests/sql/rw-eap-aka-rsa/pretest.dat       |    9 +-
 testing/tests/sql/rw-eap-aka-rsa/test.conf         |    4 +
 testing/tests/sql/rw-psk-ipv4/evaltest.dat         |   13 +-
 .../rw-psk-ipv4/hosts/carol/etc/ipsec.d/data.sql   |    2 +-
 .../rw-psk-ipv4/hosts/carol/etc/strongswan.conf    |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../rw-psk-ipv4/hosts/dave/etc/ipsec.d/data.sql    |    2 +-
 .../sql/rw-psk-ipv4/hosts/dave/etc/strongswan.conf |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../rw-psk-ipv4/hosts/moon/etc/ipsec.d/data.sql    |    2 +-
 .../sql/rw-psk-ipv4/hosts/moon/etc/strongswan.conf |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/rw-psk-ipv4/posttest.dat         |    8 +-
 testing/tests/sql/rw-psk-ipv4/pretest.dat          |   14 +-
 testing/tests/sql/rw-psk-ipv4/test.conf            |    4 +
 testing/tests/sql/rw-psk-ipv6/evaltest.dat         |   13 +-
 .../rw-psk-ipv6/hosts/carol/etc/ipsec.d/data.sql   |    2 +-
 .../rw-psk-ipv6/hosts/carol/etc/strongswan.conf    |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../rw-psk-ipv6/hosts/dave/etc/ipsec.d/data.sql    |    2 +-
 .../sql/rw-psk-ipv6/hosts/dave/etc/strongswan.conf |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../rw-psk-ipv6/hosts/moon/etc/ipsec.d/data.sql    |    2 +-
 .../sql/rw-psk-ipv6/hosts/moon/etc/strongswan.conf |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/rw-psk-ipv6/posttest.dat         |    8 +-
 testing/tests/sql/rw-psk-ipv6/pretest.dat          |   14 +-
 testing/tests/sql/rw-psk-ipv6/test.conf            |    6 +-
 testing/tests/sql/rw-psk-rsa-split/evaltest.dat    |   12 +-
 .../hosts/carol/etc/ipsec.d/data.sql               |    2 +-
 .../hosts/carol/etc/strongswan.conf                |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../hosts/dave/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/dave/etc/strongswan.conf                 |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/moon/etc/ipsec.d/data.sql                |    2 +-
 .../hosts/moon/etc/strongswan.conf                 |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/rw-psk-rsa-split/posttest.dat    |    8 +-
 testing/tests/sql/rw-psk-rsa-split/pretest.dat     |   14 +-
 testing/tests/sql/rw-psk-rsa-split/test.conf       |    4 +
 testing/tests/sql/rw-rsa-keyid/evaltest.dat        |   12 +-
 .../rw-rsa-keyid/hosts/carol/etc/ipsec.d/data.sql  |    2 +-
 .../rw-rsa-keyid/hosts/carol/etc/strongswan.conf   |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../rw-rsa-keyid/hosts/dave/etc/ipsec.d/data.sql   |    2 +-
 .../rw-rsa-keyid/hosts/dave/etc/strongswan.conf    |    2 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../rw-rsa-keyid/hosts/moon/etc/ipsec.d/data.sql   |    2 +-
 .../rw-rsa-keyid/hosts/moon/etc/strongswan.conf    |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/sql/rw-rsa-keyid/posttest.dat        |    8 +-
 testing/tests/sql/rw-rsa-keyid/pretest.dat         |   14 +-
 testing/tests/sql/rw-rsa-keyid/test.conf           |    4 +
 testing/tests/sql/rw-rsa/evaltest.dat              |   12 +-
 .../sql/rw-rsa/hosts/carol/etc/ipsec.d/data.sql    |    2 +-
 .../sql/rw-rsa/hosts/carol/etc/strongswan.conf     |    2 +-
 .../rw-rsa/hosts/carol/etc/swanctl/swanctl.conf    |    1 +
 .../sql/rw-rsa/hosts/dave/etc/ipsec.d/data.sql     |    2 +-
 .../sql/rw-rsa/hosts/dave/etc/strongswan.conf      |    2 +-
 .../sql/rw-rsa/hosts/dave/etc/swanctl/swanctl.conf |    1 +
 .../sql/rw-rsa/hosts/moon/etc/ipsec.d/data.sql     |    2 +-
 .../sql/rw-rsa/hosts/moon/etc/strongswan.conf      |    2 +-
 .../sql/rw-rsa/hosts/moon/etc/swanctl/swanctl.conf |    1 +
 testing/tests/sql/rw-rsa/posttest.dat              |    8 +-
 testing/tests/sql/rw-rsa/pretest.dat               |   14 +-
 testing/tests/sql/rw-rsa/test.conf                 |    4 +
 .../tests/sql/shunt-policies-nat-rw/evaltest.dat   |   13 +-
 .../hosts/alice/etc/ipsec.conf                     |    3 -
 .../hosts/alice/etc/ipsec.secrets                  |    3 -
 .../hosts/alice/etc/strongswan.conf                |    2 +-
 .../hosts/alice/etc/swanctl/swanctl.conf           |    1 +
 .../shunt-policies-nat-rw/hosts/sun/etc/ipsec.conf |    3 -
 .../hosts/sun/etc/ipsec.d/data.sql                 |    2 +-
 .../hosts/sun/etc/ipsec.secrets                    |    3 -
 .../hosts/sun/etc/strongswan.conf                  |    2 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |    1 +
 .../hosts/venus/etc/ipsec.conf                     |    3 -
 .../hosts/venus/etc/ipsec.secrets                  |    3 -
 .../hosts/venus/etc/strongswan.conf                |    2 +-
 .../hosts/venus/etc/swanctl/swanctl.conf           |    1 +
 .../tests/sql/shunt-policies-nat-rw/posttest.dat   |    8 +-
 .../tests/sql/shunt-policies-nat-rw/pretest.dat    |   15 +-
 testing/tests/sql/shunt-policies-nat-rw/test.conf  |    4 +
 .../tests/swanctl/config-payload/description.txt   |    8 +
 testing/tests/swanctl/config-payload/evaltest.dat  |   16 +
 .../config-payload/hosts/carol/etc/strongswan.conf |   14 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   28 +
 .../config-payload/hosts/dave/etc/strongswan.conf  |   14 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   28 +
 .../config-payload/hosts/moon/etc/strongswan.conf  |   15 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   34 +
 .../hosts/moon/etc/swanctl/swanctl_base.conf       |   17 +
 testing/tests/swanctl/config-payload/posttest.dat  |    8 +
 testing/tests/swanctl/config-payload/pretest.dat   |   12 +
 testing/tests/swanctl/config-payload/test.conf     |   25 +
 testing/tests/swanctl/dhcp-dynamic/description.txt |    8 +
 testing/tests/swanctl/dhcp-dynamic/evaltest.dat    |   22 +
 .../dhcp-dynamic/hosts/carol/etc/strongswan.conf   |   14 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   28 +
 .../dhcp-dynamic/hosts/dave/etc/strongswan.conf    |   14 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   28 +
 .../swanctl/dhcp-dynamic/hosts/moon/etc/dhcpd.conf |    9 +
 .../dhcp-dynamic/hosts/moon/etc/iptables.rules     |   39 +
 .../dhcp-dynamic/hosts/moon/etc/strongswan.conf    |   20 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   26 +
 .../dhcp-dynamic/hosts/venus/etc/dhcp/dhcpd.conf   |   14 +
 .../dhcp-dynamic/hosts/venus/etc/dnsmasq.conf      |    7 +
 testing/tests/swanctl/dhcp-dynamic/posttest.dat    |   12 +
 testing/tests/swanctl/dhcp-dynamic/pretest.dat     |   13 +
 testing/tests/swanctl/dhcp-dynamic/test.conf       |   25 +
 testing/tests/swanctl/frags-ipv4/description.txt   |    8 +-
 testing/tests/swanctl/frags-ipv4/evaltest.dat      |    8 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    5 -
 .../frags-ipv4/hosts/dave/etc/swanctl/swanctl.conf |    5 -
 .../frags-ipv4/hosts/moon/etc/swanctl/swanctl.conf |    5 -
 testing/tests/swanctl/frags-ipv4/pretest.dat       |    4 +-
 testing/tests/swanctl/frags-ipv6/evaltest.dat      |    8 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    5 -
 .../frags-ipv6/hosts/dave/etc/swanctl/swanctl.conf |    5 -
 .../frags-ipv6/hosts/moon/etc/swanctl/swanctl.conf |    5 -
 testing/tests/swanctl/frags-ipv6/pretest.dat       |    4 +-
 testing/tests/swanctl/ip-pool-db/evaltest.dat      |    8 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    9 +-
 .../ip-pool-db/hosts/dave/etc/swanctl/swanctl.conf |    9 +-
 .../ip-pool-db/hosts/moon/etc/swanctl/swanctl.conf |    9 +-
 testing/tests/swanctl/ip-pool-db/pretest.dat       |    6 +-
 testing/tests/swanctl/ip-pool/evaltest.dat         |    8 +-
 .../ip-pool/hosts/carol/etc/swanctl/swanctl.conf   |    9 +-
 .../ip-pool/hosts/dave/etc/swanctl/swanctl.conf    |    9 +-
 .../ip-pool/hosts/moon/etc/swanctl/swanctl.conf    |    9 +-
 testing/tests/swanctl/ip-pool/pretest.dat          |    4 +-
 .../mult-auth-rsa-eap-sim-id/description.txt       |   17 +
 .../swanctl/mult-auth-rsa-eap-sim-id/evaltest.dat  |   20 +
 .../hosts/alice/etc/freeradius/eap.conf            |    5 +
 .../hosts/alice/etc/freeradius/modules/sim_files   |    3 +
 .../hosts/alice/etc/freeradius/proxy.conf          |    5 +
 .../alice/etc/freeradius/sites-available/default   |   61 +
 .../hosts/alice/etc/freeradius/triplets.dat        |    6 +
 .../hosts/alice/etc/freeradius/users               |    0
 .../hosts/carol/etc/ipsec.d/triplets.dat           |    3 +
 .../hosts/carol/etc/strongswan.conf                |   10 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   32 +
 .../hosts/dave/etc/ipsec.d/triplets.dat            |    3 +
 .../hosts/dave/etc/strongswan.conf                 |   10 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   32 +
 .../hosts/moon/etc/iptables.rules                  |    0
 .../hosts/moon/etc/strongswan.conf                 |   17 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   30 +
 .../swanctl/mult-auth-rsa-eap-sim-id/posttest.dat  |    4 +
 .../swanctl/mult-auth-rsa-eap-sim-id/pretest.dat   |   15 +
 .../swanctl/mult-auth-rsa-eap-sim-id/test.conf     |   30 +
 testing/tests/swanctl/multi-level-ca/evaltest.dat  |   12 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 -
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 -
 .../hosts/moon/etc/swanctl/swanctl.conf            |    2 -
 testing/tests/swanctl/multi-level-ca/pretest.dat   |    4 +-
 testing/tests/swanctl/net2net-cert/evaltest.dat    |    4 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    9 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |    9 +-
 testing/tests/swanctl/net2net-cert/pretest.dat     |    3 +-
 .../tests/swanctl/net2net-pubkey/description.txt   |    7 +
 testing/tests/swanctl/net2net-pubkey/evaltest.dat  |    5 +
 .../net2net-pubkey/hosts/moon/etc/strongswan.conf  |   10 +
 .../hosts/moon/etc/swanctl/pubkey/moonPub.pem      |    9 +
 .../hosts/moon/etc/swanctl/pubkey/sunPub.pem       |    9 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   30 +
 .../net2net-pubkey/hosts/sun/etc/strongswan.conf   |   10 +
 .../hosts/sun/etc/swanctl/pubkey/moonPub.pem       |    9 +
 .../hosts/sun/etc/swanctl/pubkey/sunPub.pem        |    9 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |   30 +
 testing/tests/swanctl/net2net-pubkey/posttest.dat  |    7 +
 testing/tests/swanctl/net2net-pubkey/pretest.dat   |    8 +
 testing/tests/swanctl/net2net-pubkey/test.conf     |   25 +
 testing/tests/swanctl/net2net-route/evaltest.dat   |    4 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    8 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |    8 +-
 testing/tests/swanctl/net2net-route/pretest.dat    |    5 +-
 testing/tests/swanctl/net2net-start/evaltest.dat   |    4 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    8 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |    8 +-
 testing/tests/swanctl/net2net-start/pretest.dat    |    2 +-
 .../tests/swanctl/ocsp-multi-level/evaltest.dat    |   22 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 -
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 -
 .../hosts/moon/etc/swanctl/swanctl.conf            |    2 -
 testing/tests/swanctl/ocsp-multi-level/pretest.dat |    4 +-
 .../tests/swanctl/protoport-dual/description.txt   |    7 +
 testing/tests/swanctl/protoport-dual/evaltest.dat  |    7 +
 .../protoport-dual/hosts/carol/etc/strongswan.conf |   10 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../protoport-dual/hosts/moon/etc/strongswan.conf  |   10 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   35 +
 testing/tests/swanctl/protoport-dual/posttest.dat  |    5 +
 testing/tests/swanctl/protoport-dual/pretest.dat   |    8 +
 testing/tests/swanctl/protoport-dual/test.conf     |   25 +
 .../tests/swanctl/protoport-range/description.txt  |    7 +
 testing/tests/swanctl/protoport-range/evaltest.dat |    7 +
 .../hosts/carol/etc/strongswan.conf                |   10 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   42 +
 .../protoport-range/hosts/moon/etc/strongswan.conf |   10 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   43 +
 testing/tests/swanctl/protoport-range/posttest.dat |    5 +
 testing/tests/swanctl/protoport-range/pretest.dat  |   10 +
 testing/tests/swanctl/protoport-range/test.conf    |   25 +
 testing/tests/swanctl/rw-cert/evaltest.dat         |    8 +-
 .../hosts/carol/etc/swanctl/rsa/carolKey.pem       |   30 +
 .../rw-cert/hosts/carol/etc/swanctl/swanctl.conf   |   17 +-
 .../rw-cert/hosts/dave/etc/swanctl/swanctl.conf    |    9 +-
 .../rw-cert/hosts/moon/etc/swanctl/swanctl.conf    |    9 +-
 testing/tests/swanctl/rw-cert/pretest.dat          |    4 +-
 testing/tests/swanctl/rw-dnssec/description.txt    |   10 +
 testing/tests/swanctl/rw-dnssec/evaltest.dat       |   20 +
 .../rw-dnssec/hosts/carol/etc/iptables.rules       |   28 +
 .../swanctl/rw-dnssec/hosts/carol/etc/resolv.conf  |    1 +
 .../rw-dnssec/hosts/carol/etc/strongswan.conf      |   19 +
 .../rw-dnssec/hosts/carol/etc/swanctl/dnssec.keys  |   10 +
 .../hosts/carol/etc/swanctl/pubkey/carolPub.der    |  Bin 0 -> 294 bytes
 .../rw-dnssec/hosts/carol/etc/swanctl/swanctl.conf |   28 +
 .../rw-dnssec/hosts/dave/etc/iptables.rules        |   28 +
 .../swanctl/rw-dnssec/hosts/dave/etc/resolv.conf   |    1 +
 .../rw-dnssec/hosts/dave/etc/strongswan.conf       |   19 +
 .../rw-dnssec/hosts/dave/etc/swanctl/dnssec.keys   |   10 +
 .../hosts/dave/etc/swanctl/pubkey/davePub.der      |  Bin 0 -> 294 bytes
 .../rw-dnssec/hosts/dave/etc/swanctl/swanctl.conf  |   28 +
 .../rw-dnssec/hosts/moon/etc/iptables.rules        |   28 +
 .../swanctl/rw-dnssec/hosts/moon/etc/resolv.conf   |    1 +
 .../rw-dnssec/hosts/moon/etc/strongswan.conf       |   22 +
 .../rw-dnssec/hosts/moon/etc/swanctl/dnssec.keys   |   10 +
 .../hosts/moon/etc/swanctl/pubkey/moonPub.der      |  Bin 0 -> 294 bytes
 .../rw-dnssec/hosts/moon/etc/swanctl/swanctl.conf  |   32 +
 testing/tests/swanctl/rw-dnssec/posttest.dat       |   11 +
 testing/tests/swanctl/rw-dnssec/pretest.dat        |   14 +
 testing/tests/swanctl/rw-dnssec/test.conf          |   25 +
 testing/tests/swanctl/rw-hash-and-url/evaltest.dat |    8 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    9 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    9 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    9 +-
 testing/tests/swanctl/rw-hash-and-url/pretest.dat  |    4 +-
 .../tests/swanctl/rw-ntru-bliss/description.txt    |   14 +
 testing/tests/swanctl/rw-ntru-bliss/evaltest.dat   |   18 +
 .../rw-ntru-bliss/hosts/carol/etc/strongswan.conf  |   13 +
 .../hosts/carol/etc/swanctl/bliss/carolKey.der     |  Bin 0 -> 1182 bytes
 .../hosts/carol/etc/swanctl/swanctl.conf           |   30 +
 .../hosts/carol/etc/swanctl/x509/carolCert.der     |  Bin 0 -> 2175 bytes
 .../etc/swanctl/x509ca/strongswan_blissCert.der    |  Bin 0 -> 2086 bytes
 .../rw-ntru-bliss/hosts/dave/etc/strongswan.conf   |   13 +
 .../hosts/dave/etc/swanctl/bliss/daveKey.der       |  Bin 0 -> 1310 bytes
 .../hosts/dave/etc/swanctl/swanctl.conf            |   30 +
 .../hosts/dave/etc/swanctl/x509/daveCert.der       |  Bin 0 -> 2179 bytes
 .../etc/swanctl/x509ca/strongswan_blissCert.der    |  Bin 0 -> 2086 bytes
 .../rw-ntru-bliss/hosts/moon/etc/strongswan.conf   |   14 +
 .../hosts/moon/etc/swanctl/bliss/moonKey.der       |  Bin 0 -> 1310 bytes
 .../hosts/moon/etc/swanctl/swanctl.conf            |   34 +
 .../hosts/moon/etc/swanctl/x509/moonCert.der       |  Bin 0 -> 2200 bytes
 .../etc/swanctl/x509ca/strongswan_blissCert.der    |  Bin 0 -> 2086 bytes
 testing/tests/swanctl/rw-ntru-bliss/posttest.dat   |    9 +
 testing/tests/swanctl/rw-ntru-bliss/pretest.dat    |   14 +
 testing/tests/swanctl/rw-ntru-bliss/test.conf      |   25 +
 testing/tests/swanctl/rw-psk-fqdn/evaltest.dat     |    8 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    9 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    9 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    9 +-
 testing/tests/swanctl/rw-psk-fqdn/pretest.dat      |    4 +-
 testing/tests/swanctl/rw-psk-ikev1/description.txt |   16 +
 testing/tests/swanctl/rw-psk-ikev1/evaltest.dat    |   14 +
 .../rw-psk-ikev1/hosts/carol/etc/strongswan.conf   |   23 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   33 +
 .../rw-psk-ikev1/hosts/dave/etc/strongswan.conf    |   23 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   32 +
 .../rw-psk-ikev1/hosts/moon/etc/strongswan.conf    |   23 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   67 +
 testing/tests/swanctl/rw-psk-ikev1/posttest.dat    |    8 +
 testing/tests/swanctl/rw-psk-ikev1/pretest.dat     |   15 +
 testing/tests/swanctl/rw-psk-ikev1/test.conf       |   25 +
 testing/tests/swanctl/rw-psk-ipv4/evaltest.dat     |    8 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    9 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    9 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    9 +-
 testing/tests/swanctl/rw-psk-ipv4/pretest.dat      |    4 +-
 .../tests/swanctl/rw-pubkey-anon/description.txt   |    9 +
 testing/tests/swanctl/rw-pubkey-anon/evaltest.dat  |   10 +
 .../rw-pubkey-anon/hosts/carol/etc/strongswan.conf |   14 +
 .../hosts/carol/etc/swanctl/pubkey/carolPub.pem    |    9 +
 .../hosts/carol/etc/swanctl/pubkey/moonPub.pem     |    9 +
 .../hosts/carol/etc/swanctl/rsa/carolKey.pem       |   30 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   34 +
 .../rw-pubkey-anon/hosts/dave/etc/strongswan.conf  |   14 +
 .../hosts/dave/etc/swanctl/pubkey/davePub.pem      |    9 +
 .../hosts/dave/etc/swanctl/pubkey/moonPub.pem      |    9 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   26 +
 .../rw-pubkey-anon/hosts/moon/etc/strongswan.conf  |   14 +
 .../hosts/moon/etc/swanctl/pubkey/carolPub.pem     |    9 +
 .../hosts/moon/etc/swanctl/pubkey/davePub.pem      |    9 +
 .../hosts/moon/etc/swanctl/pubkey/moonPub.pem      |    9 +
 .../hosts/moon/etc/swanctl/pubkey/sunPub.pem       |    9 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   24 +
 testing/tests/swanctl/rw-pubkey-anon/posttest.dat  |   11 +
 testing/tests/swanctl/rw-pubkey-anon/pretest.dat   |   14 +
 testing/tests/swanctl/rw-pubkey-anon/test.conf     |   25 +
 .../tests/swanctl/rw-pubkey-keyid/description.txt  |    8 +
 testing/tests/swanctl/rw-pubkey-keyid/evaltest.dat |   10 +
 .../hosts/carol/etc/strongswan.conf                |   14 +
 .../hosts/carol/etc/swanctl/pubkey/carolPub.pem    |    9 +
 .../hosts/carol/etc/swanctl/pubkey/moonPub.pem     |    9 +
 .../hosts/carol/etc/swanctl/rsa/carolKey.pem       |   30 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   34 +
 .../rw-pubkey-keyid/hosts/dave/etc/strongswan.conf |   14 +
 .../hosts/dave/etc/swanctl/pubkey/davePub.pem      |    9 +
 .../hosts/dave/etc/swanctl/pubkey/moonPub.pem      |    9 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   26 +
 .../rw-pubkey-keyid/hosts/moon/etc/strongswan.conf |   14 +
 .../hosts/moon/etc/swanctl/pubkey/carolPub.pem     |    9 +
 .../hosts/moon/etc/swanctl/pubkey/davePub.pem      |    9 +
 .../hosts/moon/etc/swanctl/pubkey/moonPub.pem      |    9 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   20 +
 .../hosts/moon/etc/swanctl/swanctl_base.conf       |   16 +
 testing/tests/swanctl/rw-pubkey-keyid/posttest.dat |   11 +
 testing/tests/swanctl/rw-pubkey-keyid/pretest.dat  |   15 +
 testing/tests/swanctl/rw-pubkey-keyid/test.conf    |   25 +
 .../swanctl/shunt-policies-nat-rw/description.txt  |    7 +
 .../swanctl/shunt-policies-nat-rw/evaltest.dat     |   14 +
 .../hosts/alice/etc/strongswan.conf                |   11 +
 .../hosts/alice/etc/swanctl/swanctl.conf           |   40 +
 .../hosts/sun/etc/iptables.rules                   |   24 +
 .../hosts/sun/etc/strongswan.conf                  |   11 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |   32 +
 .../hosts/venus/etc/strongswan.conf                |   11 +
 .../hosts/venus/etc/swanctl/swanctl.conf           |   40 +
 .../swanctl/shunt-policies-nat-rw/posttest.dat     |    5 +
 .../swanctl/shunt-policies-nat-rw/pretest.dat      |   11 +
 .../tests/swanctl/shunt-policies-nat-rw/test.conf  |   25 +
 testing/tests/swanctl/xauth-rsa/description.txt    |    9 +
 testing/tests/swanctl/xauth-rsa/evaltest.dat       |   12 +
 .../xauth-rsa/hosts/carol/etc/strongswan.conf      |   10 +
 .../xauth-rsa/hosts/carol/etc/swanctl/swanctl.conf |   38 +
 .../xauth-rsa/hosts/dave/etc/strongswan.conf       |   10 +
 .../xauth-rsa/hosts/dave/etc/swanctl/swanctl.conf  |   38 +
 .../xauth-rsa/hosts/moon/etc/strongswan.conf       |   10 +
 .../xauth-rsa/hosts/moon/etc/swanctl/swanctl.conf  |   40 +
 testing/tests/swanctl/xauth-rsa/posttest.dat       |    8 +
 testing/tests/swanctl/xauth-rsa/pretest.dat        |   11 +
 testing/tests/swanctl/xauth-rsa/test.conf          |   25 +
 testing/tests/tnc/tnccs-11-fhh/evaltest.dat        |   13 +-
 .../tnc/tnccs-11-fhh/hosts/carol/etc/init.d/charon |  158 +
 .../tnc/tnccs-11-fhh/hosts/carol/etc/ipsec.conf    |   23 -
 .../tnc/tnccs-11-fhh/hosts/carol/etc/ipsec.secrets |    3 -
 .../tnccs-11-fhh/hosts/carol/etc/strongswan.conf   |   18 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-11-fhh/hosts/dave/etc/init.d/charon  |  158 +
 .../tnc/tnccs-11-fhh/hosts/dave/etc/ipsec.conf     |   23 -
 .../tnc/tnccs-11-fhh/hosts/dave/etc/ipsec.secrets  |    3 -
 .../tnccs-11-fhh/hosts/dave/etc/strongswan.conf    |   18 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-11-fhh/hosts/moon/etc/init.d/charon  |  158 +
 .../tnc/tnccs-11-fhh/hosts/moon/etc/ipsec.conf     |   34 -
 .../tnc/tnccs-11-fhh/hosts/moon/etc/ipsec.secrets  |    6 -
 .../tnccs-11-fhh/hosts/moon/etc/strongswan.conf    |   18 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-11-fhh/posttest.dat        |    6 +-
 testing/tests/tnc/tnccs-11-fhh/pretest.dat         |   14 +-
 testing/tests/tnc/tnccs-11-fhh/test.conf           |    4 +-
 .../tests/tnc/tnccs-11-radius-block/evaltest.dat   |    9 +-
 .../freeradius/sites-available/inner-tunnel-second |   13 +
 .../hosts/alice/etc/strongswan.conf                |   10 +-
 .../hosts/carol/etc/ipsec.conf                     |   23 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   15 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../hosts/dave/etc/ipsec.conf                      |   23 -
 .../hosts/dave/etc/ipsec.secrets                   |    3 -
 .../hosts/dave/etc/strongswan.conf                 |   18 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../hosts/moon/etc/ipsec.conf                      |   23 -
 .../hosts/moon/etc/ipsec.secrets                   |    3 -
 .../hosts/moon/etc/strongswan.conf                 |   11 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   27 +
 .../tests/tnc/tnccs-11-radius-block/posttest.dat   |    7 +-
 .../tests/tnc/tnccs-11-radius-block/pretest.dat    |   18 +-
 testing/tests/tnc/tnccs-11-radius-block/test.conf  |    7 +-
 testing/tests/tnc/tnccs-11-radius-pts/evaltest.dat |   13 +-
 .../tnccs-11-radius-pts/hosts/carol/etc/ipsec.conf |   23 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   23 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnccs-11-radius-pts/hosts/dave/etc/ipsec.conf  |   23 -
 .../hosts/dave/etc/ipsec.secrets                   |    3 -
 .../hosts/dave/etc/strongswan.conf                 |   27 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnccs-11-radius-pts/hosts/moon/etc/ipsec.conf  |   33 -
 .../hosts/moon/etc/ipsec.secrets                   |    3 -
 .../hosts/moon/etc/strongswan.conf                 |   10 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   53 +
 testing/tests/tnc/tnccs-11-radius-pts/posttest.dat |    6 +-
 testing/tests/tnc/tnccs-11-radius-pts/pretest.dat  |   16 +-
 testing/tests/tnc/tnccs-11-radius-pts/test.conf    |    4 +
 testing/tests/tnc/tnccs-11-radius/evaltest.dat     |   13 +-
 .../hosts/alice/etc/strongswan.conf                |    1 +
 .../tnc/tnccs-11-radius/hosts/carol/etc/ipsec.conf |   23 -
 .../tnccs-11-radius/hosts/carol/etc/ipsec.secrets  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   15 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-11-radius/hosts/dave/etc/ipsec.conf  |   23 -
 .../tnccs-11-radius/hosts/dave/etc/ipsec.secrets   |    3 -
 .../tnccs-11-radius/hosts/dave/etc/strongswan.conf |   15 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-11-radius/hosts/moon/etc/ipsec.conf  |   33 -
 .../tnccs-11-radius/hosts/moon/etc/ipsec.secrets   |    3 -
 .../tnccs-11-radius/hosts/moon/etc/strongswan.conf |   10 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   53 +
 testing/tests/tnc/tnccs-11-radius/posttest.dat     |    6 +-
 testing/tests/tnc/tnccs-11-radius/pretest.dat      |   14 +-
 testing/tests/tnc/tnccs-11-radius/test.conf        |    3 +
 .../hosts/alice/etc/strongswan.conf                |    1 +
 .../tnccs-11-supplicant/hosts/carol/etc/ipsec.conf |    1 -
 .../hosts/carol/etc/ipsec.secrets                  |    1 -
 .../hosts/carol/etc/strongswan.conf                |    1 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../tnccs-11-supplicant/hosts/dave/etc/ipsec.conf  |    1 -
 .../hosts/dave/etc/ipsec.secrets                   |    1 -
 .../hosts/dave/etc/strongswan.conf                 |    1 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../tnccs-11-supplicant/hosts/moon/etc/ipsec.conf  |   33 -
 .../hosts/moon/etc/ipsec.secrets                   |    3 -
 .../hosts/moon/etc/strongswan.conf                 |   13 -
 testing/tests/tnc/tnccs-11-supplicant/test.conf    |    7 +-
 testing/tests/tnc/tnccs-11/evaltest.dat            |   13 +-
 .../tests/tnc/tnccs-11/hosts/carol/etc/ipsec.conf  |   23 -
 .../tnc/tnccs-11/hosts/carol/etc/ipsec.secrets     |    3 -
 .../tnc/tnccs-11/hosts/carol/etc/strongswan.conf   |   19 +-
 .../tnccs-11/hosts/carol/etc/swanctl/swanctl.conf  |   35 +
 .../tests/tnc/tnccs-11/hosts/dave/etc/ipsec.conf   |   23 -
 .../tnc/tnccs-11/hosts/dave/etc/ipsec.secrets      |    3 -
 .../tnc/tnccs-11/hosts/dave/etc/strongswan.conf    |   19 +-
 .../tnccs-11/hosts/dave/etc/swanctl/swanctl.conf   |   35 +
 .../tests/tnc/tnccs-11/hosts/moon/etc/ipsec.conf   |   34 -
 .../tnc/tnccs-11/hosts/moon/etc/ipsec.secrets      |    6 -
 .../tnc/tnccs-11/hosts/moon/etc/strongswan.conf    |   19 +-
 .../tnccs-11/hosts/moon/etc/swanctl/swanctl.conf   |   64 +
 testing/tests/tnc/tnccs-11/posttest.dat            |    6 +-
 testing/tests/tnc/tnccs-11/pretest.dat             |   14 +-
 testing/tests/tnc/tnccs-11/test.conf               |    4 +
 testing/tests/tnc/tnccs-20-block/evaltest.dat      |    8 +-
 .../tnc/tnccs-20-block/hosts/carol/etc/ipsec.conf  |   23 -
 .../tnccs-20-block/hosts/carol/etc/ipsec.secrets   |    3 -
 .../tnccs-20-block/hosts/carol/etc/strongswan.conf |   19 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   34 +
 .../tnc/tnccs-20-block/hosts/dave/etc/ipsec.conf   |   23 -
 .../tnccs-20-block/hosts/dave/etc/ipsec.secrets    |    3 -
 .../tnccs-20-block/hosts/dave/etc/strongswan.conf  |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   34 +
 .../tnc/tnccs-20-block/hosts/moon/etc/ipsec.conf   |   24 -
 .../tnccs-20-block/hosts/moon/etc/ipsec.secrets    |    6 -
 .../tnccs-20-block/hosts/moon/etc/strongswan.conf  |   25 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   39 +
 testing/tests/tnc/tnccs-20-block/posttest.dat      |    7 +-
 testing/tests/tnc/tnccs-20-block/pretest.dat       |   15 +-
 testing/tests/tnc/tnccs-20-block/test.conf         |    3 +
 .../tests/tnc/tnccs-20-client-retry/evaltest.dat   |   14 +-
 .../hosts/carol/etc/ipsec.conf                     |   23 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   20 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../hosts/dave/etc/ipsec.conf                      |   23 -
 .../hosts/dave/etc/ipsec.secrets                   |    3 -
 .../hosts/dave/etc/strongswan.conf                 |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../hosts/moon/etc/ipsec.conf                      |   34 -
 .../hosts/moon/etc/ipsec.secrets                   |    6 -
 .../hosts/moon/etc/strongswan.conf                 |   19 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 .../tests/tnc/tnccs-20-client-retry/posttest.dat   |    6 +-
 .../tests/tnc/tnccs-20-client-retry/pretest.dat    |   14 +-
 testing/tests/tnc/tnccs-20-client-retry/test.conf  |    3 +
 .../tnccs-20-fail-init/hosts/carol/etc/ipsec.conf  |   23 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   19 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnccs-20-fail-init/hosts/dave/etc/ipsec.conf   |   23 -
 .../hosts/dave/etc/ipsec.secrets                   |    3 -
 .../hosts/dave/etc/strongswan.conf                 |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnccs-20-fail-init/hosts/moon/etc/ipsec.conf   |   34 -
 .../hosts/moon/etc/ipsec.secrets                   |    6 -
 .../hosts/moon/etc/strongswan.conf                 |   19 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-20-fail-init/posttest.dat  |    6 +-
 testing/tests/tnc/tnccs-20-fail-init/pretest.dat   |   14 +-
 testing/tests/tnc/tnccs-20-fail-init/test.conf     |    3 +
 .../tnccs-20-fail-resp/hosts/carol/etc/ipsec.conf  |   23 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   20 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnccs-20-fail-resp/hosts/moon/etc/ipsec.conf   |   34 -
 .../hosts/moon/etc/ipsec.secrets                   |    6 -
 .../hosts/moon/etc/strongswan.conf                 |   19 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-20-fail-resp/posttest.dat  |    4 +-
 testing/tests/tnc/tnccs-20-fail-resp/pretest.dat   |    8 +-
 testing/tests/tnc/tnccs-20-fail-resp/test.conf     |    3 +
 testing/tests/tnc/tnccs-20-fhh/evaltest.dat        |   17 +-
 .../tnc/tnccs-20-fhh/hosts/carol/etc/init.d/charon |  158 +
 .../tnc/tnccs-20-fhh/hosts/carol/etc/ipsec.conf    |   23 -
 .../tnc/tnccs-20-fhh/hosts/carol/etc/ipsec.secrets |    3 -
 .../tnccs-20-fhh/hosts/carol/etc/strongswan.conf   |   20 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-20-fhh/hosts/dave/etc/init.d/charon  |  158 +
 .../tnc/tnccs-20-fhh/hosts/dave/etc/ipsec.conf     |   23 -
 .../tnc/tnccs-20-fhh/hosts/dave/etc/ipsec.secrets  |    3 -
 .../tnccs-20-fhh/hosts/dave/etc/strongswan.conf    |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-20-fhh/hosts/moon/etc/init.d/charon  |  158 +
 .../tnc/tnccs-20-fhh/hosts/moon/etc/ipsec.conf     |   34 -
 .../tnc/tnccs-20-fhh/hosts/moon/etc/ipsec.secrets  |    6 -
 .../tnccs-20-fhh/hosts/moon/etc/strongswan.conf    |   15 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-20-fhh/posttest.dat        |    6 +-
 testing/tests/tnc/tnccs-20-fhh/pretest.dat         |   15 +-
 testing/tests/tnc/tnccs-20-fhh/test.conf           |    3 +
 testing/tests/tnc/tnccs-20-hcd-eap/evaltest.dat    |    1 -
 .../tnccs-20-hcd-eap/hosts/alice/etc/ipsec.conf    |    9 -
 .../tnccs-20-hcd-eap/hosts/alice/etc/ipsec.secrets |    3 -
 .../hosts/alice/etc/strongswan.conf                |   14 +-
 .../{ipsec.d/private => swanctl/rsa}/aaaKey.pem    |    0
 .../hosts/alice/etc/swanctl/swanctl.conf           |    0
 .../{ipsec.d/certs => swanctl/x509}/aaaCert.pem    |    0
 .../tnccs-20-hcd-eap/hosts/carol/etc/ipsec.conf    |   24 -
 .../hosts/carol/etc/strongswan.conf                |   19 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   27 +
 .../tnc/tnccs-20-hcd-eap/hosts/dave/etc/ipsec.conf |   24 -
 .../hosts/dave/etc/strongswan.conf                 |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   27 +
 .../tnc/tnccs-20-hcd-eap/hosts/moon/etc/ipsec.conf |   33 -
 .../tnccs-20-hcd-eap/hosts/moon/etc/ipsec.secrets  |    3 -
 .../hosts/moon/etc/strongswan.conf                 |    7 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   53 +
 testing/tests/tnc/tnccs-20-hcd-eap/posttest.dat    |   10 +-
 testing/tests/tnc/tnccs-20-hcd-eap/pretest.dat     |   14 +-
 testing/tests/tnc/tnccs-20-hcd-eap/test.conf       |    3 +
 .../tnc/tnccs-20-mutual-eap-fail/description.txt   |    5 +
 .../tnc/tnccs-20-mutual-eap-fail/evaltest.dat      |    7 +
 .../hosts/moon/etc/strongswan.conf                 |   45 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   28 +
 .../hosts/moon/etc/tnc_config                      |    4 +
 .../hosts/sun/etc/strongswan.conf                  |   47 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |   28 +
 .../hosts/sun/etc/tnc_config                       |    4 +
 .../tnc/tnccs-20-mutual-eap-fail/posttest.dat      |    4 +
 .../tests/tnc/tnccs-20-mutual-eap-fail/pretest.dat |    6 +
 .../tests/tnc/tnccs-20-mutual-eap-fail/test.conf   |   25 +
 .../tests/tnc/tnccs-20-mutual-eap/description.txt  |    5 +-
 testing/tests/tnc/tnccs-20-mutual-eap/evaltest.dat |   12 +-
 .../tnccs-20-mutual-eap/hosts/moon/etc/ipsec.conf  |   23 -
 .../hosts/moon/etc/strongswan.conf                 |   23 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   28 +
 .../tnccs-20-mutual-eap/hosts/sun/etc/ipsec.conf   |   23 -
 .../hosts/sun/etc/strongswan.conf                  |   23 +-
 .../hosts/sun/etc/swanctl/swanctl.conf             |   28 +
 testing/tests/tnc/tnccs-20-mutual-eap/posttest.dat |    4 +-
 testing/tests/tnc/tnccs-20-mutual-eap/pretest.dat  |    8 +-
 testing/tests/tnc/tnccs-20-mutual-eap/test.conf    |    4 +
 .../hosts/moon/etc/ipsec.conf                      |    3 -
 .../hosts/moon/etc/pts/options                     |    6 +-
 .../hosts/moon/etc/strongswan.conf                 |    6 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 .../hosts/sun/etc/ipsec.conf                       |    9 -
 .../hosts/sun/etc/strongswan.conf                  |   19 +-
 .../hosts/sun/etc/swantcl/swanctl.conf             |    0
 .../tests/tnc/tnccs-20-mutual-pt-tls/posttest.dat  |    2 +-
 .../tests/tnc/tnccs-20-mutual-pt-tls/pretest.dat   |    4 +-
 testing/tests/tnc/tnccs-20-mutual-pt-tls/test.conf |    4 +
 testing/tests/tnc/tnccs-20-os-pts/evaltest.dat     |    8 +-
 .../tnc/tnccs-20-os-pts/hosts/carol/etc/ipsec.conf |   23 -
 .../tnccs-20-os-pts/hosts/carol/etc/ipsec.secrets  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   21 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-20-os-pts/hosts/dave/etc/ipsec.conf  |   23 -
 .../tnccs-20-os-pts/hosts/dave/etc/ipsec.secrets   |    3 -
 .../tnccs-20-os-pts/hosts/dave/etc/strongswan.conf |   21 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-20-os-pts/hosts/moon/etc/ipsec.conf  |   34 -
 .../tnccs-20-os-pts/hosts/moon/etc/ipsec.secrets   |    6 -
 .../tnccs-20-os-pts/hosts/moon/etc/strongswan.conf |   20 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-20-os-pts/posttest.dat     |    6 +-
 testing/tests/tnc/tnccs-20-os-pts/pretest.dat      |   16 +-
 testing/tests/tnc/tnccs-20-os-pts/test.conf        |    4 +
 testing/tests/tnc/tnccs-20-os/evaltest.dat         |    8 +-
 .../tnc/tnccs-20-os/hosts/carol/etc/ipsec.conf     |   23 -
 .../tnc/tnccs-20-os/hosts/carol/etc/ipsec.secrets  |    3 -
 .../tnccs-20-os/hosts/carol/etc/strongswan.conf    |   20 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-20-os/hosts/dave/etc/ipsec.conf      |   23 -
 .../tnc/tnccs-20-os/hosts/dave/etc/ipsec.secrets   |    3 -
 .../tnc/tnccs-20-os/hosts/dave/etc/strongswan.conf |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-20-os/hosts/moon/etc/ipsec.conf      |   34 -
 .../tnc/tnccs-20-os/hosts/moon/etc/ipsec.secrets   |    6 -
 .../tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf |   19 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-20-os/posttest.dat         |    6 +-
 testing/tests/tnc/tnccs-20-os/pretest.dat          |   19 +-
 testing/tests/tnc/tnccs-20-os/test.conf            |    6 +-
 testing/tests/tnc/tnccs-20-pdp-eap/evaltest.dat    |    8 +-
 .../tnccs-20-pdp-eap/hosts/alice/etc/ipsec.conf    |    9 -
 .../tnccs-20-pdp-eap/hosts/alice/etc/ipsec.secrets |    6 -
 .../hosts/alice/etc/strongswan.conf                |   14 +-
 .../{ipsec.d/private => swanctl/rsa}/aaaKey.pem    |    0
 .../hosts/alice/etc/swanctl/swanctl.conf           |   11 +
 .../{ipsec.d/certs => swanctl/x509}/aaaCert.pem    |    0
 .../tnccs-20-pdp-eap/hosts/carol/etc/ipsec.conf    |   23 -
 .../tnccs-20-pdp-eap/hosts/carol/etc/ipsec.secrets |    3 -
 .../hosts/carol/etc/strongswan.conf                |   21 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-20-pdp-eap/hosts/dave/etc/ipsec.conf |   23 -
 .../tnccs-20-pdp-eap/hosts/dave/etc/ipsec.secrets  |    3 -
 .../hosts/dave/etc/strongswan.conf                 |   21 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-20-pdp-eap/hosts/moon/etc/ipsec.conf |   33 -
 .../tnccs-20-pdp-eap/hosts/moon/etc/ipsec.secrets  |    3 -
 .../hosts/moon/etc/strongswan.conf                 |    8 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   53 +
 testing/tests/tnc/tnccs-20-pdp-eap/posttest.dat    |   10 +-
 testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat     |   18 +-
 testing/tests/tnc/tnccs-20-pdp-eap/test.conf       |    3 +
 .../tnccs-20-pdp-pt-tls/hosts/alice/etc/ipsec.conf |    9 -
 .../hosts/alice/etc/ipsec.secrets                  |    6 -
 .../hosts/alice/etc/strongswan.conf                |   15 +-
 .../{ipsec.d/private => swanctl/rsa}/aaaKey.pem    |    0
 .../hosts/alice/etc/swanctl/swanctl.conf           |    7 +
 .../{ipsec.d/certs => swanctl/x509}/aaaCert.pem    |    0
 .../tnccs-20-pdp-pt-tls/hosts/carol/etc/ipsec.conf |    3 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/pts/options                    |    2 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |    1 +
 .../tnccs-20-pdp-pt-tls/hosts/dave/etc/ipsec.conf  |    3 -
 .../hosts/dave/etc/ipsec.secrets                   |    3 -
 .../tnccs-20-pdp-pt-tls/hosts/dave/etc/pts/options |    6 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |    1 +
 .../tnccs-20-pdp-pt-tls/hosts/moon/etc/ipsec.conf  |    3 -
 .../hosts/moon/etc/ipsec.secrets                   |    3 -
 .../hosts/moon/etc/swanctl/swanctl.conf            |    1 +
 testing/tests/tnc/tnccs-20-pdp-pt-tls/posttest.dat |    4 +-
 testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat  |    4 +-
 testing/tests/tnc/tnccs-20-pdp-pt-tls/test.conf    |    4 +
 testing/tests/tnc/tnccs-20-pts-no-ecc/evaltest.dat |    8 +-
 .../tnccs-20-pts-no-ecc/hosts/carol/etc/ipsec.conf |   23 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   21 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnccs-20-pts-no-ecc/hosts/dave/etc/ipsec.conf  |   23 -
 .../hosts/dave/etc/ipsec.secrets                   |    3 -
 .../hosts/dave/etc/strongswan.conf                 |   22 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnccs-20-pts-no-ecc/hosts/moon/etc/ipsec.conf  |   34 -
 .../hosts/moon/etc/ipsec.secrets                   |    6 -
 .../hosts/moon/etc/strongswan.conf                 |   20 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-20-pts-no-ecc/posttest.dat |    6 +-
 testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat  |   14 +-
 testing/tests/tnc/tnccs-20-pts-no-ecc/test.conf    |    3 +
 testing/tests/tnc/tnccs-20-pts/evaltest.dat        |    8 +-
 .../hosts/carol/etc/.strongswan.conf.swp           |  Bin 0 -> 12288 bytes
 .../tnc/tnccs-20-pts/hosts/carol/etc/ipsec.conf    |   23 -
 .../tnc/tnccs-20-pts/hosts/carol/etc/ipsec.secrets |    3 -
 .../tnccs-20-pts/hosts/carol/etc/strongswan.conf   |   21 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-20-pts/hosts/dave/etc/ipsec.conf     |   23 -
 .../tnc/tnccs-20-pts/hosts/dave/etc/ipsec.secrets  |    3 -
 .../tnccs-20-pts/hosts/dave/etc/strongswan.conf    |   23 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-20-pts/hosts/moon/etc/ipsec.conf     |   34 -
 .../tnc/tnccs-20-pts/hosts/moon/etc/ipsec.secrets  |    6 -
 .../tnccs-20-pts/hosts/moon/etc/strongswan.conf    |   22 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-20-pts/posttest.dat        |    6 +-
 testing/tests/tnc/tnccs-20-pts/pretest.dat         |   14 +-
 testing/tests/tnc/tnccs-20-pts/test.conf           |    3 +
 .../tests/tnc/tnccs-20-server-retry/evaltest.dat   |   13 +-
 .../hosts/carol/etc/ipsec.conf                     |   23 -
 .../hosts/carol/etc/ipsec.secrets                  |    3 -
 .../hosts/carol/etc/strongswan.conf                |   20 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../hosts/dave/etc/ipsec.conf                      |   23 -
 .../hosts/dave/etc/ipsec.secrets                   |    3 -
 .../hosts/dave/etc/strongswan.conf                 |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../hosts/moon/etc/ipsec.conf                      |   34 -
 .../hosts/moon/etc/ipsec.secrets                   |    6 -
 .../hosts/moon/etc/strongswan.conf                 |   19 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 .../tests/tnc/tnccs-20-server-retry/posttest.dat   |    6 +-
 .../tests/tnc/tnccs-20-server-retry/pretest.dat    |   14 +-
 testing/tests/tnc/tnccs-20-server-retry/test.conf  |    3 +
 testing/tests/tnc/tnccs-20-tls/evaltest.dat        |   13 +-
 .../tnc/tnccs-20-tls/hosts/carol/etc/ipsec.conf    |   23 -
 .../tnccs-20-tls/hosts/carol/etc/strongswan.conf   |   20 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   27 +
 .../tnc/tnccs-20-tls/hosts/dave/etc/ipsec.conf     |   23 -
 .../tnccs-20-tls/hosts/dave/etc/strongswan.conf    |   20 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   27 +
 .../tnc/tnccs-20-tls/hosts/moon/etc/ipsec.conf     |   34 -
 .../tnc/tnccs-20-tls/hosts/moon/etc/ipsec.secrets  |    6 -
 .../tnccs-20-tls/hosts/moon/etc/strongswan.conf    |   19 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   50 +
 testing/tests/tnc/tnccs-20-tls/posttest.dat        |    6 +-
 testing/tests/tnc/tnccs-20-tls/pretest.dat         |   10 +-
 testing/tests/tnc/tnccs-20-tls/test.conf           |    3 +
 testing/tests/tnc/tnccs-20/evaltest.dat            |   13 +-
 .../tests/tnc/tnccs-20/hosts/carol/etc/ipsec.conf  |   23 -
 .../tnc/tnccs-20/hosts/carol/etc/ipsec.secrets     |    3 -
 .../tnc/tnccs-20/hosts/carol/etc/strongswan.conf   |   20 +-
 .../tnccs-20/hosts/carol/etc/swanctl/swanctl.conf  |   35 +
 .../tests/tnc/tnccs-20/hosts/dave/etc/ipsec.conf   |   23 -
 .../tnc/tnccs-20/hosts/dave/etc/ipsec.secrets      |    3 -
 .../tnc/tnccs-20/hosts/dave/etc/strongswan.conf    |   19 +-
 .../tnccs-20/hosts/dave/etc/swanctl/swanctl.conf   |   35 +
 .../tests/tnc/tnccs-20/hosts/moon/etc/ipsec.conf   |   34 -
 .../tnc/tnccs-20/hosts/moon/etc/ipsec.secrets      |    6 -
 .../tnc/tnccs-20/hosts/moon/etc/strongswan.conf    |   19 +-
 .../tnccs-20/hosts/moon/etc/swanctl/swanctl.conf   |   64 +
 testing/tests/tnc/tnccs-20/posttest.dat            |    6 +-
 testing/tests/tnc/tnccs-20/pretest.dat             |   14 +-
 testing/tests/tnc/tnccs-20/test.conf               |    3 +
 testing/tests/tnc/tnccs-dynamic/evaltest.dat       |   13 +-
 .../tnc/tnccs-dynamic/hosts/carol/etc/ipsec.conf   |   23 -
 .../tnccs-dynamic/hosts/carol/etc/ipsec.secrets    |    3 -
 .../tnccs-dynamic/hosts/carol/etc/strongswan.conf  |   19 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   35 +
 .../tnc/tnccs-dynamic/hosts/dave/etc/ipsec.conf    |   23 -
 .../tnc/tnccs-dynamic/hosts/dave/etc/ipsec.secrets |    3 -
 .../tnccs-dynamic/hosts/dave/etc/strongswan.conf   |   19 +-
 .../hosts/dave/etc/swanctl/swanctl.conf            |   35 +
 .../tnc/tnccs-dynamic/hosts/moon/etc/ipsec.conf    |   34 -
 .../tnc/tnccs-dynamic/hosts/moon/etc/ipsec.secrets |    6 -
 .../tnccs-dynamic/hosts/moon/etc/strongswan.conf   |   20 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   64 +
 testing/tests/tnc/tnccs-dynamic/posttest.dat       |    6 +-
 testing/tests/tnc/tnccs-dynamic/pretest.dat        |   14 +-
 testing/tests/tnc/tnccs-dynamic/test.conf          |    3 +
 1547 files changed, 38974 insertions(+), 26297 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git



More information about the Pkg-swan-devel mailing list