[Pkg-swan-devel] [strongswan] branch upstream updated (518dd33 -> bf37270)

Yves-Alexis Perez corsac at moszumanska.debian.org
Sat Jul 16 13:34:55 UTC 2016


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

corsac pushed a change to branch upstream
in repository strongswan.

      from  518dd33   Imported Upstream version 5.4.0
       new  bf37270   Imported Upstream version 5.5.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Android.common.mk                                  |    2 +-
 Android.mk                                         |    7 +-
 Makefile.in                                        |   51 +-
 NEWS                                               |   38 +
 aclocal.m4                                         |  295 +-
 compile                                            |    2 +-
 conf/Makefile.in                                   |   30 +-
 conf/options/charon.conf                           |    5 +
 conf/options/charon.opt                            |    5 +
 conf/plugins/imc-attestation.opt                   |    6 +
 conf/strongswan.conf.5.main                        |   14 +
 config.guess                                       |  233 +-
 config.h.in                                        |    8 +-
 config.sub                                         |   60 +-
 configure                                          | 2363 ++++++---
 configure.ac                                       |   58 +-
 depcomp                                            |    2 +-
 init/Makefile.in                                   |   26 +-
 init/systemd-swanctl/Makefile.in                   |   26 +-
 init/systemd/Makefile.in                           |   26 +-
 install-sh                                         |  373 +-
 ltmain.sh                                          | 5533 +++++++++++++-------
 m4/config/libtool.m4                               | 2525 +++++----
 m4/config/ltoptions.m4                             |  127 +-
 m4/config/ltsugar.m4                               |    7 +-
 m4/config/ltversion.m4                             |   12 +-
 m4/config/lt~obsolete.m4                           |    7 +-
 man/Makefile.in                                    |   28 +-
 missing                                            |    6 +-
 scripts/Makefile.in                                |   27 +-
 scripts/timeattack.c                               |   10 +-
 src/Makefile.am                                    |    8 +
 src/Makefile.in                                    |   91 +-
 src/_copyright/Makefile.in                         |   27 +-
 src/_updown/Makefile.in                            |   26 +-
 src/aikgen/Makefile.am                             |    9 +-
 src/aikgen/Makefile.in                             |   36 +-
 src/aikgen/aikgen.c                                |  229 +-
 src/aikpub2/Makefile.am                            |   15 +
 src/{aikgen => aikpub2}/Makefile.in                |   69 +-
 src/aikpub2/aikpub2.c                              |  305 ++
 src/charon-cmd/Makefile.am                         |    2 +-
 src/charon-cmd/Makefile.in                         |   33 +-
 src/charon-cmd/cmd/cmd_connection.c                |   42 +-
 src/charon-nm/Makefile.am                          |    2 +-
 src/charon-nm/Makefile.in                          |   31 +-
 src/charon-nm/nm/nm_service.c                      |   84 +-
 src/charon-svc/Makefile.in                         |   27 +-
 src/charon-systemd/Makefile.am                     |    3 +-
 src/charon-systemd/Makefile.in                     |   32 +-
 src/charon-tkm/Makefile.in                         |   26 +-
 src/charon-tkm/src/tkm/tkm_diffie_hellman.c        |    6 +-
 src/charon-tkm/src/tkm/tkm_kernel_ipsec.c          |   97 +-
 src/charon-tkm/src/tkm/tkm_kernel_sad.c            |   32 +-
 src/charon-tkm/src/tkm/tkm_kernel_sad.h            |   10 +-
 src/charon-tkm/src/tkm/tkm_keymat.c                |    8 +-
 src/charon-tkm/src/tkm/tkm_nonceg.c                |    2 +-
 src/charon-tkm/src/tkm/tkm_spi_generator.c         |   12 +-
 src/charon-tkm/tests/nonceg_tests.c                |    6 +-
 src/charon/Makefile.am                             |    2 +-
 src/charon/Makefile.in                             |   32 +-
 src/checksum/Makefile.am                           |    5 +
 src/checksum/Makefile.in                           |   79 +-
 src/checksum/checksum_builder.c                    |    2 +-
 src/conftest/Makefile.am                           |    2 +-
 src/conftest/Makefile.in                           |   32 +-
 src/conftest/actions.c                             |    2 +-
 src/conftest/config.c                              |   26 +-
 src/conftest/hooks/custom_proposal.c               |    4 +-
 src/conftest/hooks/log_proposals.c                 |    2 +-
 src/conftest/hooks/rebuild_auth.c                  |    2 +-
 src/conftest/hooks/reset_seq.c                     |    2 +-
 src/conftest/hooks/set_ike_spi.c                   |    4 +-
 src/conftest/hooks/set_length.c                    |    4 +-
 src/conftest/hooks/set_proposal_number.c           |    2 +-
 src/conftest/hooks/set_reserved.c                  |    6 +-
 src/dumm/Makefile.in                               |   27 +-
 src/dumm/mconsole.c                                |   18 +-
 src/include/Makefile.in                            |   26 +-
 src/include/linux/pfkeyv2.h                        |    2 +-
 src/ipsec/Makefile.in                              |   27 +-
 src/ipsec/_ipsec.8                                 |    2 +-
 src/libcharon/Android.mk                           |    1 +
 src/libcharon/Makefile.am                          |    5 +-
 src/libcharon/Makefile.in                          |   83 +-
 src/libcharon/attributes/mem_pool.c                |   16 +-
 src/libcharon/bus/bus.c                            |    2 +-
 src/libcharon/bus/bus.h                            |   10 +-
 src/libcharon/bus/listeners/listener.h             |    2 +-
 src/libcharon/config/child_cfg.c                   |  172 +-
 src/libcharon/config/child_cfg.h                   |  116 +-
 src/libcharon/config/ike_cfg.c                     |   87 +-
 src/libcharon/config/ike_cfg.h                     |   19 +-
 src/libcharon/config/peer_cfg.c                    |   89 +-
 src/libcharon/config/peer_cfg.h                    |   97 +-
 src/libcharon/config/proposal.c                    |   66 +-
 src/libcharon/config/proposal.h                    |   10 +-
 src/libcharon/control/controller.c                 |   76 +-
 src/libcharon/control/controller.h                 |    4 +-
 src/libcharon/daemon.c                             |   63 +-
 src/libcharon/encoding/generator.c                 |   64 +-
 src/libcharon/encoding/generator.h                 |    2 +-
 src/libcharon/encoding/message.c                   |   42 +-
 src/libcharon/encoding/message.h                   |   16 +-
 src/libcharon/encoding/parser.c                    |   64 +-
 src/libcharon/encoding/parser.h                    |    2 +-
 src/libcharon/encoding/payloads/auth_payload.c     |    8 +-
 src/libcharon/encoding/payloads/cert_payload.c     |    6 +-
 src/libcharon/encoding/payloads/certreq_payload.c  |    6 +-
 .../encoding/payloads/configuration_attribute.c    |   12 +-
 .../encoding/payloads/configuration_attribute.h    |    4 +-
 src/libcharon/encoding/payloads/cp_payload.c       |   14 +-
 src/libcharon/encoding/payloads/cp_payload.h       |    4 +-
 src/libcharon/encoding/payloads/delete_payload.c   |   28 +-
 src/libcharon/encoding/payloads/delete_payload.h   |    8 +-
 src/libcharon/encoding/payloads/eap_payload.c      |   28 +-
 src/libcharon/encoding/payloads/eap_payload.h      |   12 +-
 src/libcharon/encoding/payloads/encodings.h        |    6 +-
 .../encoding/payloads/encrypted_fragment_payload.h |    6 +-
 .../encoding/payloads/encrypted_payload.c          |   48 +-
 .../encoding/payloads/encrypted_payload.h          |    2 +-
 src/libcharon/encoding/payloads/endpoint_notify.c  |   44 +-
 src/libcharon/encoding/payloads/endpoint_notify.h  |    4 +-
 src/libcharon/encoding/payloads/fragment_payload.c |   18 +-
 src/libcharon/encoding/payloads/fragment_payload.h |    6 +-
 src/libcharon/encoding/payloads/hash_payload.c     |    6 +-
 src/libcharon/encoding/payloads/id_payload.c       |   18 +-
 src/libcharon/encoding/payloads/ike_header.c       |   40 +-
 src/libcharon/encoding/payloads/ike_header.h       |   24 +-
 src/libcharon/encoding/payloads/ke_payload.c       |    8 +-
 src/libcharon/encoding/payloads/nonce_payload.c    |    4 +-
 src/libcharon/encoding/payloads/notify_payload.c   |   24 +-
 src/libcharon/encoding/payloads/notify_payload.h   |    8 +-
 src/libcharon/encoding/payloads/payload.c          |    2 +-
 src/libcharon/encoding/payloads/payload.h          |    2 +-
 .../encoding/payloads/proposal_substructure.c      |  120 +-
 .../encoding/payloads/proposal_substructure.h      |   22 +-
 src/libcharon/encoding/payloads/sa_payload.c       |   32 +-
 src/libcharon/encoding/payloads/sa_payload.h       |   14 +-
 .../payloads/traffic_selector_substructure.c       |   10 +-
 .../payloads/traffic_selector_substructure.h       |    4 +-
 .../encoding/payloads/transform_attribute.c        |   14 +-
 .../encoding/payloads/transform_attribute.h        |    6 +-
 .../encoding/payloads/transform_substructure.c     |   18 +-
 .../encoding/payloads/transform_substructure.h     |    6 +-
 src/libcharon/encoding/payloads/ts_payload.c       |    6 +-
 src/libcharon/encoding/payloads/unknown_payload.c  |    4 +-
 .../encoding/payloads/vendor_id_payload.c          |    4 +-
 src/libcharon/kernel/kernel_handler.c              |   10 +-
 src/libcharon/kernel/kernel_interface.c            |  115 +-
 src/libcharon/kernel/kernel_interface.h            |  185 +-
 src/libcharon/kernel/kernel_ipsec.h                |  299 +-
 src/libcharon/kernel/kernel_listener.h             |    8 +-
 src/libcharon/kernel/kernel_net.h                  |   12 +-
 src/libcharon/network/receiver.c                   |   32 +-
 src/libcharon/network/socket.h                     |    2 +-
 src/libcharon/network/socket_manager.c             |    4 +-
 src/libcharon/network/socket_manager.h             |    2 +-
 src/libcharon/plugins/addrblock/Makefile.in        |   27 +-
 src/libcharon/plugins/android_dns/Makefile.in      |   27 +-
 src/libcharon/plugins/android_log/Makefile.in      |   27 +-
 src/libcharon/plugins/attr/Makefile.in             |   27 +-
 src/libcharon/plugins/attr/attr_provider.c         |    4 +-
 src/libcharon/plugins/attr_sql/Makefile.in         |   27 +-
 src/libcharon/plugins/certexpire/Makefile.in       |   27 +-
 src/libcharon/plugins/connmark/Makefile.in         |   27 +-
 src/libcharon/plugins/connmark/connmark_listener.c |   45 +-
 src/libcharon/plugins/coupling/Makefile.in         |   27 +-
 src/libcharon/plugins/dhcp/Makefile.in             |   27 +-
 src/libcharon/plugins/dhcp/dhcp_socket.c           |   34 +-
 src/libcharon/plugins/dhcp/dhcp_transaction.c      |    6 +-
 src/libcharon/plugins/dhcp/dhcp_transaction.h      |    4 +-
 src/libcharon/plugins/dnscert/Makefile.in          |   27 +-
 src/libcharon/plugins/dnscert/dnscert.c            |    8 +-
 src/libcharon/plugins/dnscert/dnscert.h            |    2 +-
 src/libcharon/plugins/duplicheck/Makefile.in       |   27 +-
 src/libcharon/plugins/duplicheck/duplicheck.c      |    2 +-
 src/libcharon/plugins/duplicheck/duplicheck_msg.h  |    2 +-
 .../plugins/duplicheck/duplicheck_notify.c         |    2 +-
 src/libcharon/plugins/eap_aka/Makefile.in          |   27 +-
 src/libcharon/plugins/eap_aka/eap_aka_peer.c       |   16 +-
 src/libcharon/plugins/eap_aka/eap_aka_server.c     |   14 +-
 src/libcharon/plugins/eap_aka_3gpp2/Makefile.in    |   27 +-
 .../eap_aka_3gpp2/eap_aka_3gpp2_functions.c        |   10 +-
 src/libcharon/plugins/eap_dynamic/Makefile.in      |   27 +-
 src/libcharon/plugins/eap_dynamic/eap_dynamic.c    |   12 +-
 src/libcharon/plugins/eap_gtc/Makefile.in          |   27 +-
 src/libcharon/plugins/eap_gtc/eap_gtc.c            |   18 +-
 src/libcharon/plugins/eap_identity/Makefile.in     |   27 +-
 src/libcharon/plugins/eap_identity/eap_identity.c  |   18 +-
 src/libcharon/plugins/eap_md5/Makefile.in          |   27 +-
 src/libcharon/plugins/eap_md5/eap_md5.c            |   20 +-
 src/libcharon/plugins/eap_mschapv2/Makefile.in     |   27 +-
 src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c  |   58 +-
 src/libcharon/plugins/eap_peap/Makefile.in         |   27 +-
 src/libcharon/plugins/eap_peap/eap_peap.c          |    6 +-
 src/libcharon/plugins/eap_peap/eap_peap_avp.c      |    8 +-
 src/libcharon/plugins/eap_peap/eap_peap_avp.h      |    2 +-
 src/libcharon/plugins/eap_peap/eap_peap_peer.c     |    4 +-
 src/libcharon/plugins/eap_peap/eap_peap_server.c   |    4 +-
 src/libcharon/plugins/eap_radius/Makefile.in       |   27 +-
 src/libcharon/plugins/eap_radius/eap_radius.c      |   32 +-
 .../plugins/eap_radius/eap_radius_accounting.c     |   28 +-
 .../plugins/eap_radius/eap_radius_accounting.h     |    2 +-
 src/libcharon/plugins/eap_radius/eap_radius_dae.c  |    4 +-
 .../plugins/eap_radius/eap_radius_forward.c        |    6 +-
 .../plugins/eap_radius/eap_radius_provider.c       |    4 +-
 .../plugins/eap_radius/eap_radius_provider.h       |    4 +-
 src/libcharon/plugins/eap_sim/Makefile.in          |   27 +-
 src/libcharon/plugins/eap_sim/eap_sim_peer.c       |   16 +-
 src/libcharon/plugins/eap_sim/eap_sim_server.c     |   14 +-
 src/libcharon/plugins/eap_sim_file/Makefile.in     |   27 +-
 src/libcharon/plugins/eap_sim_pcsc/Makefile.in     |   27 +-
 .../plugins/eap_simaka_pseudonym/Makefile.in       |   27 +-
 .../eap_simaka_pseudonym_card.c                    |   82 +-
 .../plugins/eap_simaka_reauth/Makefile.in          |   27 +-
 .../eap_simaka_reauth/eap_simaka_reauth_card.c     |    6 +-
 .../eap_simaka_reauth/eap_simaka_reauth_provider.c |    4 +-
 src/libcharon/plugins/eap_simaka_sql/Makefile.in   |   27 +-
 src/libcharon/plugins/eap_tls/Makefile.in          |   27 +-
 src/libcharon/plugins/eap_tls/eap_tls.c            |    6 +-
 src/libcharon/plugins/eap_tnc/Makefile.in          |   27 +-
 src/libcharon/plugins/eap_ttls/Makefile.in         |   27 +-
 src/libcharon/plugins/eap_ttls/eap_ttls.c          |    6 +-
 src/libcharon/plugins/eap_ttls/eap_ttls_avp.c      |   10 +-
 src/libcharon/plugins/eap_ttls/eap_ttls_peer.c     |    6 +-
 src/libcharon/plugins/error_notify/Makefile.in     |   27 +-
 .../plugins/error_notify/error_notify_listener.c   |    5 +
 .../plugins/error_notify/error_notify_msg.h        |    1 +
 src/libcharon/plugins/ext_auth/Makefile.in         |   27 +-
 src/libcharon/plugins/farp/Makefile.in             |   27 +-
 src/libcharon/plugins/farp/farp_listener.c         |    2 +-
 src/libcharon/plugins/farp/farp_spoofer.c          |   18 +-
 src/libcharon/plugins/forecast/Makefile.in         |   27 +-
 .../plugins/forecast/forecast_forwarder.c          |    6 +-
 src/libcharon/plugins/forecast/forecast_listener.c |   32 +-
 src/libcharon/plugins/ha/Makefile.in               |   27 +-
 src/libcharon/plugins/ha/ha_attribute.c            |   12 +-
 src/libcharon/plugins/ha/ha_cache.c                |    4 +-
 src/libcharon/plugins/ha/ha_child.c                |    4 +-
 src/libcharon/plugins/ha/ha_dispatcher.c           |   20 +-
 src/libcharon/plugins/ha/ha_ike.c                  |    6 +-
 src/libcharon/plugins/ha/ha_kernel.c               |   20 +-
 src/libcharon/plugins/ha/ha_kernel.h               |    2 +-
 src/libcharon/plugins/ha/ha_message.c              |   86 +-
 src/libcharon/plugins/ha/ha_message.h              |   44 +-
 src/libcharon/plugins/ha/ha_segments.h             |    2 +-
 src/libcharon/plugins/ha/ha_tunnel.c               |   28 +-
 src/libcharon/plugins/ipseckey/Makefile.in         |   27 +-
 src/libcharon/plugins/ipseckey/ipseckey.c          |   10 +-
 src/libcharon/plugins/ipseckey/ipseckey.h          |    2 +-
 src/libcharon/plugins/ipseckey/ipseckey_cred.c     |    2 +-
 src/libcharon/plugins/kernel_iph/Makefile.in       |   27 +-
 src/libcharon/plugins/kernel_iph/kernel_iph_net.c  |   13 +-
 src/libcharon/plugins/kernel_libipsec/Makefile.in  |   27 +-
 .../kernel_libipsec/kernel_libipsec_ipsec.c        |  101 +-
 src/libcharon/plugins/kernel_netlink/Makefile.am   |    2 +
 src/libcharon/plugins/kernel_netlink/Makefile.in   |   31 +-
 .../plugins/kernel_netlink/kernel_netlink_ipsec.c  | 1098 ++--
 .../plugins/kernel_netlink/kernel_netlink_net.c    |  126 +-
 .../plugins/kernel_netlink/kernel_netlink_shared.c |    8 +-
 src/libcharon/plugins/kernel_pfkey/Makefile.in     |   27 +-
 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.c      |  690 +--
 src/libcharon/plugins/kernel_pfroute/Makefile.in   |   27 +-
 .../plugins/kernel_pfroute/kernel_pfroute_net.c    |   34 +-
 src/libcharon/plugins/kernel_wfp/Makefile.in       |   27 +-
 .../plugins/kernel_wfp/kernel_wfp_ipsec.c          |  260 +-
 src/libcharon/plugins/led/Makefile.in              |   27 +-
 src/libcharon/plugins/load_tester/Makefile.in      |   27 +-
 src/libcharon/plugins/load_tester/load_tester.c    |    2 +-
 .../plugins/load_tester/load_tester_config.c       |   58 +-
 .../plugins/load_tester/load_tester_creds.c        |    4 +-
 .../plugins/load_tester/load_tester_ipsec.c        |   45 +-
 src/libcharon/plugins/lookip/Makefile.in           |   27 +-
 src/libcharon/plugins/maemo/Makefile.in            |   27 +-
 src/libcharon/plugins/maemo/maemo_service.c        |   36 +-
 src/libcharon/plugins/medcli/Makefile.in           |   27 +-
 src/libcharon/plugins/medcli/medcli_config.c       |   88 +-
 src/libcharon/plugins/medsrv/Makefile.in           |   27 +-
 src/libcharon/plugins/medsrv/medsrv_config.c       |   20 +-
 src/libcharon/plugins/osx_attr/Makefile.in         |   27 +-
 src/libcharon/plugins/p_cscf/Makefile.am           |    1 -
 src/libcharon/plugins/p_cscf/Makefile.in           |   28 +-
 src/libcharon/plugins/radattr/Makefile.in          |   27 +-
 src/libcharon/plugins/resolve/Makefile.in          |   27 +-
 src/libcharon/plugins/resolve/resolve_handler.c    |  203 +-
 src/libcharon/plugins/smp/Makefile.in              |   27 +-
 src/libcharon/plugins/smp/smp.c                    |    2 +-
 src/libcharon/plugins/socket_default/Makefile.in   |   27 +-
 .../plugins/socket_default/socket_default_socket.c |   32 +-
 src/libcharon/plugins/socket_dynamic/Makefile.in   |   27 +-
 .../plugins/socket_dynamic/socket_dynamic_socket.c |   10 +-
 src/libcharon/plugins/socket_win/Makefile.in       |   27 +-
 .../plugins/socket_win/socket_win_socket.c         |    6 +-
 src/libcharon/plugins/sql/Makefile.in              |   27 +-
 src/libcharon/plugins/sql/sql_config.c             |   50 +-
 src/libcharon/plugins/sql/sql_logger.c             |    2 +-
 src/libcharon/plugins/stroke/Makefile.in           |   27 +-
 src/libcharon/plugins/stroke/stroke_config.c       |  132 +-
 src/libcharon/plugins/stroke/stroke_control.c      |   18 +-
 src/libcharon/plugins/stroke/stroke_counter.c      |   10 +-
 src/libcharon/plugins/stroke/stroke_cred.c         |   47 +-
 src/libcharon/plugins/stroke/stroke_list.c         |   10 +-
 src/libcharon/plugins/stroke/stroke_socket.c       |    2 +-
 src/libcharon/plugins/systime_fix/Makefile.in      |   27 +-
 src/libcharon/plugins/tnc_ifmap/Makefile.in        |   27 +-
 .../plugins/tnc_ifmap/tnc_ifmap_listener.c         |    2 +-
 .../tnc_ifmap/tnc_ifmap_renew_session_job.c        |    4 +-
 .../tnc_ifmap/tnc_ifmap_renew_session_job.h        |    2 +-
 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c   |    6 +-
 src/libcharon/plugins/tnc_pdp/Makefile.in          |   27 +-
 src/libcharon/plugins/tnc_pdp/tnc_pdp.c            |   16 +-
 src/libcharon/plugins/uci/Makefile.in              |   27 +-
 src/libcharon/plugins/uci/uci_config.c             |   36 +-
 src/libcharon/plugins/unity/Makefile.in            |   27 +-
 src/libcharon/plugins/unity/unity_handler.c        |    8 +-
 src/libcharon/plugins/unity/unity_provider.c       |    4 +-
 src/libcharon/plugins/updown/Makefile.in           |   27 +-
 src/libcharon/plugins/updown/updown_listener.c     |   12 +-
 src/libcharon/plugins/vici/Makefile.in             |   27 +-
 src/libcharon/plugins/vici/README.md               |   11 +-
 src/libcharon/plugins/vici/libvici.c               |   18 +-
 src/libcharon/plugins/vici/perl/Makefile.in        |   26 +-
 src/libcharon/plugins/vici/python/MANIFEST.in      |    1 +
 src/libcharon/plugins/vici/python/Makefile.am      |   20 +-
 src/libcharon/plugins/vici/python/Makefile.in      |   46 +-
 src/libcharon/plugins/vici/python/README.rst       |   24 +
 src/libcharon/plugins/vici/python/setup.py.in      |   18 +-
 src/libcharon/plugins/vici/python/vici/protocol.py |   11 +-
 src/libcharon/plugins/vici/ruby/Makefile.in        |   28 +-
 src/libcharon/plugins/vici/suites/test_socket.c    |    4 +-
 src/libcharon/plugins/vici/vici_attribute.c        |    6 +-
 src/libcharon/plugins/vici/vici_config.c           |  329 +-
 src/libcharon/plugins/vici/vici_control.c          |    6 +-
 src/libcharon/plugins/vici/vici_dispatcher.c       |    6 +-
 src/libcharon/plugins/vici/vici_message.c          |    2 +-
 src/libcharon/plugins/vici/vici_query.c            |   36 +-
 src/libcharon/plugins/vici/vici_socket.c           |    6 +-
 src/libcharon/plugins/whitelist/Makefile.in        |   27 +-
 src/libcharon/plugins/xauth_eap/Makefile.in        |   27 +-
 src/libcharon/plugins/xauth_eap/xauth_eap.c        |    2 +-
 src/libcharon/plugins/xauth_generic/Makefile.in    |   27 +-
 src/libcharon/plugins/xauth_noauth/Makefile.in     |   27 +-
 src/libcharon/plugins/xauth_pam/Makefile.in        |   27 +-
 src/libcharon/processing/jobs/acquire_job.c        |    4 +-
 src/libcharon/processing/jobs/acquire_job.h        |    2 +-
 src/libcharon/processing/jobs/adopt_children_job.c |    2 +-
 .../processing/jobs/delete_child_sa_job.c          |    4 +-
 .../processing/jobs/delete_child_sa_job.h          |    2 +-
 src/libcharon/processing/jobs/inactivity_job.c     |   10 +-
 src/libcharon/processing/jobs/inactivity_job.h     |    2 +-
 src/libcharon/processing/jobs/migrate_job.c        |    4 +-
 src/libcharon/processing/jobs/migrate_job.h        |    2 +-
 src/libcharon/processing/jobs/rekey_child_sa_job.c |    4 +-
 src/libcharon/processing/jobs/rekey_child_sa_job.h |    2 +-
 src/libcharon/processing/jobs/rekey_ike_sa_job.c   |    6 +-
 src/libcharon/processing/jobs/retransmit_job.c     |    4 +-
 src/libcharon/processing/jobs/retransmit_job.h     |    2 +-
 src/libcharon/processing/jobs/update_sa_job.c      |    4 +-
 src/libcharon/processing/jobs/update_sa_job.h      |    2 +-
 src/libcharon/sa/child_sa.c                        |  398 +-
 src/libcharon/sa/child_sa.h                        |   18 +-
 src/libcharon/sa/child_sa_manager.c                |   14 +-
 src/libcharon/sa/child_sa_manager.h                |    4 +-
 src/libcharon/sa/eap/eap_manager.c                 |    8 +-
 src/libcharon/sa/eap/eap_manager.h                 |    6 +-
 src/libcharon/sa/eap/eap_method.h                  |    6 +-
 src/libcharon/sa/ike_sa.c                          |   72 +-
 src/libcharon/sa/ike_sa.h                          |   48 +-
 src/libcharon/sa/ike_sa_id.c                       |   20 +-
 src/libcharon/sa/ike_sa_id.h                       |   14 +-
 src/libcharon/sa/ike_sa_manager.c                  |   94 +-
 src/libcharon/sa/ike_sa_manager.h                  |    4 +-
 src/libcharon/sa/ikev1/keymat_v1.c                 |   48 +-
 src/libcharon/sa/ikev1/keymat_v1.h                 |    8 +-
 src/libcharon/sa/ikev1/task_manager_v1.c           |  100 +-
 src/libcharon/sa/ikev1/tasks/aggressive_mode.c     |   17 +-
 src/libcharon/sa/ikev1/tasks/isakmp_delete.c       |    2 +-
 src/libcharon/sa/ikev1/tasks/isakmp_dpd.c          |    8 +-
 src/libcharon/sa/ikev1/tasks/isakmp_dpd.h          |    2 +-
 src/libcharon/sa/ikev1/tasks/isakmp_natd.c         |    4 +-
 src/libcharon/sa/ikev1/tasks/isakmp_vendor.c       |    2 +-
 src/libcharon/sa/ikev1/tasks/main_mode.c           |   22 +-
 src/libcharon/sa/ikev1/tasks/mode_config.c         |    2 +-
 src/libcharon/sa/ikev1/tasks/quick_delete.c        |   10 +-
 src/libcharon/sa/ikev1/tasks/quick_delete.h        |    2 +-
 src/libcharon/sa/ikev1/tasks/quick_mode.c          |   60 +-
 src/libcharon/sa/ikev1/tasks/quick_mode.h          |    6 +-
 src/libcharon/sa/ikev1/tasks/xauth.c               |    2 +-
 .../sa/ikev2/authenticators/eap_authenticator.c    |   16 +-
 .../sa/ikev2/authenticators/pubkey_authenticator.c |    4 +-
 src/libcharon/sa/ikev2/connect_manager.c           |   34 +-
 src/libcharon/sa/ikev2/keymat_v2.c                 |   20 +-
 src/libcharon/sa/ikev2/task_manager_v2.c           |  284 +-
 src/libcharon/sa/ikev2/tasks/child_create.c        |   74 +-
 src/libcharon/sa/ikev2/tasks/child_create.h        |    2 +-
 src/libcharon/sa/ikev2/tasks/child_delete.c        |   73 +-
 src/libcharon/sa/ikev2/tasks/child_delete.h        |    2 +-
 src/libcharon/sa/ikev2/tasks/child_rekey.c         |  146 +-
 src/libcharon/sa/ikev2/tasks/child_rekey.h         |   23 +-
 src/libcharon/sa/ikev2/tasks/ike_auth.c            |   23 +-
 src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.c   |    8 +-
 src/libcharon/sa/ikev2/tasks/ike_delete.c          |   62 +-
 src/libcharon/sa/ikev2/tasks/ike_init.c            |   12 +-
 src/libcharon/sa/ikev2/tasks/ike_me.c              |    2 +-
 src/libcharon/sa/ikev2/tasks/ike_mobike.c          |    2 +-
 src/libcharon/sa/ikev2/tasks/ike_natd.c            |    6 +-
 src/libcharon/sa/ikev2/tasks/ike_rekey.c           |  261 +-
 src/libcharon/sa/ikev2/tasks/ike_rekey.h           |   10 +-
 src/libcharon/sa/redirect_manager.c                |    2 +-
 src/libcharon/sa/shunt_manager.c                   |  110 +-
 src/libcharon/sa/task_manager.h                    |   25 +-
 src/libcharon/sa/trap_manager.c                    |   26 +-
 src/libcharon/sa/trap_manager.h                    |   10 +-
 src/libcharon/tests/Makefile.am                    |   34 +-
 src/libcharon/tests/Makefile.in                    |  333 +-
 .../tests/{libcharon_tests.c => exchange_tests.c}  |   21 +-
 .../tests/{libcharon_tests.h => exchange_tests.h}  |   12 +-
 src/libcharon/tests/libcharon_tests.c              |    3 -
 src/libcharon/tests/libcharon_tests.h              |   12 +
 src/libcharon/tests/suites/test_child_create.c     |  106 +
 src/libcharon/tests/suites/test_child_delete.c     |  366 ++
 src/libcharon/tests/suites/test_child_rekey.c      | 1569 ++++++
 src/libcharon/tests/suites/test_ike_delete.c       |  137 +
 src/libcharon/tests/suites/test_ike_rekey.c        | 1480 ++++++
 src/libcharon/tests/suites/test_message_chapoly.c  |    8 +-
 src/libcharon/tests/suites/test_proposal.c         |   81 +
 src/libcharon/tests/utils/exchange_test_asserts.c  |  182 +
 src/libcharon/tests/utils/exchange_test_asserts.h  |  343 ++
 src/libcharon/tests/utils/exchange_test_helper.c   |  372 ++
 src/libcharon/tests/utils/exchange_test_helper.h   |  128 +
 src/libcharon/tests/utils/job_asserts.h            |   59 +
 src/libcharon/tests/utils/mock_dh.c                |   87 +
 .../tests/utils/mock_dh.h}                         |   26 +-
 src/libcharon/tests/utils/mock_ipsec.c             |  128 +
 .../tests/utils/mock_ipsec.h}                      |   34 +-
 .../tests/utils/mock_nonce_gen.c}                  |   65 +-
 .../tests/utils/mock_nonce_gen.h}                  |   26 +-
 src/libcharon/tests/utils/mock_sender.c            |   85 +
 src/libcharon/tests/utils/mock_sender.h            |   56 +
 src/libcharon/tests/utils/sa_asserts.h             |  145 +
 src/libfast/Makefile.am                            |    2 +-
 src/libfast/Makefile.in                            |   33 +-
 src/libimcv/Android.mk                             |    4 +-
 src/libimcv/Makefile.am                            |   10 +-
 src/libimcv/Makefile.in                            |   74 +-
 src/libimcv/generic/generic_attr_bool.c            |    4 +-
 src/libimcv/generic/generic_attr_chunk.c           |    2 +-
 src/libimcv/generic/generic_attr_string.c          |    2 +-
 src/libimcv/ietf/ietf_attr.c                       |    2 +-
 src/libimcv/ietf/ietf_attr.h                       |    2 +-
 src/libimcv/ietf/ietf_attr_assess_result.c         |    8 +-
 src/libimcv/ietf/ietf_attr_assess_result.h         |    4 +-
 src/libimcv/ietf/ietf_attr_attr_request.c          |   10 +-
 src/libimcv/ietf/ietf_attr_attr_request.h          |    4 +-
 src/libimcv/ietf/ietf_attr_fwd_enabled.c           |    4 +-
 src/libimcv/ietf/ietf_attr_installed_packages.c    |    4 +-
 src/libimcv/ietf/ietf_attr_numeric_version.c       |   26 +-
 src/libimcv/ietf/ietf_attr_numeric_version.h       |   14 +-
 src/libimcv/ietf/ietf_attr_op_status.c             |   14 +-
 src/libimcv/ietf/ietf_attr_op_status.h             |    6 +-
 src/libimcv/ietf/ietf_attr_port_filter.c           |   16 +-
 src/libimcv/ietf/ietf_attr_port_filter.h           |    4 +-
 src/libimcv/ietf/ietf_attr_product_info.c          |    8 +-
 src/libimcv/ietf/ietf_attr_product_info.h          |    4 +-
 src/libimcv/ietf/ietf_attr_remediation_instr.c     |    4 +-
 src/libimcv/ietf/ietf_attr_string_version.c        |    2 +-
 src/libimcv/imc/imc_agent.c                        |    8 +-
 src/libimcv/imc/imc_agent.h                        |    2 +-
 src/libimcv/imc/imc_os_info.c                      |    2 +-
 src/libimcv/imc/imc_os_info.h                      |    4 +-
 src/libimcv/imc/imc_state.h                        |    4 +-
 src/libimcv/imv/data.sql                           |  170 +-
 src/libimcv/imv/imv_database.h                     |    2 +-
 src/libimcv/ita/ita_attr.c                         |    2 +-
 src/libimcv/ita/ita_attr.h                         |    2 +-
 src/libimcv/ita/ita_attr_angel.c                   |    2 +-
 src/libimcv/ita/ita_attr_command.c                 |    2 +-
 src/libimcv/ita/ita_attr_dummy.c                   |    2 +-
 src/libimcv/ita/ita_attr_get_settings.c            |    4 +-
 src/libimcv/ita/ita_attr_settings.c                |    4 +-
 src/libimcv/pa_tnc/pa_tnc_attr_manager.h           |    2 +-
 src/libimcv/plugins/imc_attestation/Makefile.am    |    3 +-
 src/libimcv/plugins/imc_attestation/Makefile.in    |   30 +-
 .../imc_attestation/imc_attestation_process.c      |   43 +-
 .../imc_attestation/imc_attestation_state.c        |    8 +-
 .../imc_attestation/imc_attestation_state.h        |    2 +-
 src/libimcv/plugins/imc_hcd/Makefile.in            |   27 +-
 src/libimcv/plugins/imc_hcd/imc_hcd_state.c        |    6 +-
 src/libimcv/plugins/imc_os/Makefile.in             |   27 +-
 src/libimcv/plugins/imc_os/imc_os.c                |    2 +-
 src/libimcv/plugins/imc_os/imc_os_state.c          |    6 +-
 src/libimcv/plugins/imc_scanner/Makefile.in        |   27 +-
 src/libimcv/plugins/imc_scanner/imc_scanner.c      |    4 +-
 .../plugins/imc_scanner/imc_scanner_state.c        |    6 +-
 src/libimcv/plugins/imc_swid/Makefile.in           |   27 +-
 src/libimcv/plugins/imc_swid/imc_swid_state.c      |   14 +-
 src/libimcv/plugins/imc_swid/imc_swid_state.h      |    2 +-
 src/libimcv/plugins/imc_test/Makefile.in           |   27 +-
 src/libimcv/plugins/imc_test/imc_test_state.c      |    6 +-
 src/libimcv/plugins/imv_attestation/Makefile.am    |    3 +
 src/libimcv/plugins/imv_attestation/Makefile.in    |   32 +-
 src/libimcv/plugins/imv_attestation/attest_db.c    |    2 +-
 .../imv_attestation/imv_attestation_agent.c        |    7 +-
 .../imv_attestation/imv_attestation_process.c      |   37 +-
 src/libimcv/plugins/imv_hcd/Makefile.am            |    1 +
 src/libimcv/plugins/imv_hcd/Makefile.in            |   28 +-
 src/libimcv/plugins/imv_os/Makefile.am             |    3 +-
 src/libimcv/plugins/imv_os/Makefile.in             |   30 +-
 src/libimcv/plugins/imv_scanner/Makefile.am        |    3 +-
 src/libimcv/plugins/imv_scanner/Makefile.in        |   30 +-
 .../plugins/imv_scanner/imv_scanner_agent.c        |    8 +-
 src/libimcv/plugins/imv_swid/Makefile.am           |    1 +
 src/libimcv/plugins/imv_swid/Makefile.in           |   28 +-
 src/libimcv/plugins/imv_test/Makefile.in           |   27 +-
 src/libimcv/pts/components/ita/ita_comp_ima.h      |    2 +-
 src/libimcv/pts/components/ita/ita_comp_tboot.c    |   20 +-
 src/libimcv/pts/components/ita/ita_comp_tboot.h    |    2 +-
 src/libimcv/pts/components/ita/ita_comp_tgrub.c    |   20 +-
 src/libimcv/pts/components/ita/ita_comp_tgrub.h    |    2 +-
 src/libimcv/pts/components/pts_comp_evidence.c     |   14 +-
 src/libimcv/pts/components/pts_comp_evidence.h     |   10 +-
 src/libimcv/pts/components/pts_comp_func_name.c    |   22 +-
 src/libimcv/pts/components/pts_comp_func_name.h    |   12 +-
 src/libimcv/pts/components/pts_component.h         |   10 +-
 src/libimcv/pts/components/pts_component_manager.c |   10 +-
 src/libimcv/pts/components/pts_component_manager.h |    8 +-
 src/libimcv/pts/pts.c                              |  766 +--
 src/libimcv/pts/pts.h                              |   74 +-
 src/libimcv/pts/pts_file_meas.c                    |    8 +-
 src/libimcv/pts/pts_file_meas.h                    |    6 +-
 src/libimcv/pts/pts_file_meta.h                    |   12 +-
 src/libimcv/pts/pts_ima_bios_list.c                |    9 +-
 src/libimcv/pts/pts_meas_algo.c                    |   18 +
 src/libimcv/pts/pts_meas_algo.h                    |    8 +
 src/libimcv/pts/pts_pcr.c                          |   54 +-
 src/libimcv/pts/pts_pcr.h                          |   16 +-
 src/libimcv/pts/pts_simple_evid_final.h            |   47 -
 src/libimcv/pwg/pwg_attr.c                         |    2 +-
 src/libimcv/pwg/pwg_attr.h                         |    2 +-
 src/libimcv/pwg/pwg_attr_vendor_smi_code.c         |    2 +-
 src/libimcv/swid/swid_error.c                      |    4 +-
 src/libimcv/swid/swid_error.h                      |    4 +-
 src/libimcv/tcg/pts/tcg_pts_attr_aik.c             |    6 +-
 src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.c |    6 +-
 src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.h |    2 +-
 .../tcg/pts/tcg_pts_attr_dh_nonce_params_req.c     |   12 +-
 .../tcg/pts/tcg_pts_attr_dh_nonce_params_req.h     |    4 +-
 .../tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c    |    8 +-
 src/libimcv/tcg/pts/tcg_pts_attr_file_meas.c       |    6 +-
 src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.c |    4 +-
 src/libimcv/tcg/pts/tcg_pts_attr_get_aik.c         |    4 +-
 .../tcg/pts/tcg_pts_attr_get_tpm_version_info.c    |    4 +-
 src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.c       |    4 +-
 src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.c      |    4 +-
 src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.c   |   20 +-
 src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.h   |    8 +-
 src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.c   |   14 +-
 src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.h   |    4 +-
 .../tcg/pts/tcg_pts_attr_req_func_comp_evid.c      |   18 +-
 .../tcg/pts/tcg_pts_attr_req_func_comp_evid.h      |    2 +-
 .../tcg/pts/tcg_pts_attr_simple_comp_evid.c        |   16 +-
 .../tcg/pts/tcg_pts_attr_simple_evid_final.c       |  249 +-
 .../tcg/pts/tcg_pts_attr_simple_evid_final.h       |   29 +-
 .../tcg/pts/tcg_pts_attr_tpm_version_info.c        |    2 +-
 src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.c  |   12 +-
 src/libimcv/tcg/seg/tcg_seg_attr_max_size.c        |    2 +-
 src/libimcv/tcg/seg/tcg_seg_attr_next_seg.c        |    2 +-
 src/libimcv/tcg/seg/tcg_seg_attr_seg_env.c         |    2 +-
 src/libimcv/tcg/swid/tcg_swid_attr_req.c           |   20 +-
 src/libimcv/tcg/swid/tcg_swid_attr_req.h           |   10 +-
 src/libimcv/tcg/tcg_attr.c                         |    2 +-
 src/libimcv/tcg/tcg_attr.h                         |    2 +-
 src/libipsec/Makefile.in                           |   27 +-
 src/libipsec/esp_context.c                         |   12 +-
 src/libipsec/esp_context.h                         |    8 +-
 src/libipsec/esp_packet.c                          |   28 +-
 src/libipsec/esp_packet.h                          |    6 +-
 src/libipsec/ip_packet.c                           |   58 +-
 src/libipsec/ip_packet.h                           |    6 +-
 src/libipsec/ipsec_event_listener.h                |    2 +-
 src/libipsec/ipsec_event_relay.c                   |    6 +-
 src/libipsec/ipsec_event_relay.h                   |    2 +-
 src/libipsec/ipsec_policy.c                        |    8 +-
 src/libipsec/ipsec_policy.h                        |    4 +-
 src/libipsec/ipsec_policy_mgr.c                    |   14 +-
 src/libipsec/ipsec_policy_mgr.h                    |    2 +-
 src/libipsec/ipsec_processor.c                     |    4 +-
 src/libipsec/ipsec_sa.c                            |   36 +-
 src/libipsec/ipsec_sa.h                            |   28 +-
 src/libipsec/ipsec_sa_mgr.c                        |   62 +-
 src/libipsec/ipsec_sa_mgr.h                        |   24 +-
 src/libipsec/tests/Makefile.in                     |   27 +-
 src/libipsec/tests/suites/test_chapoly.c           |    6 +-
 src/libpttls/Makefile.in                           |   27 +-
 src/libpttls/pt_tls.c                              |   11 +-
 src/libpttls/pt_tls.h                              |    6 +-
 src/libpttls/pt_tls_client.c                       |   16 +-
 src/libpttls/pt_tls_server.c                       |   14 +-
 src/libradius/Makefile.in                          |   27 +-
 src/libradius/radius_config.c                      |    2 +-
 src/libradius/radius_config.h                      |    2 +-
 src/libradius/radius_message.c                     |   30 +-
 src/libradius/radius_message.h                     |   10 +-
 src/libradius/radius_mppe.h                        |   10 +-
 src/libradius/radius_socket.c                      |   18 +-
 src/libradius/radius_socket.h                      |    4 +-
 src/libsimaka/Makefile.in                          |   27 +-
 src/libsimaka/simaka_card.h                        |    6 +-
 src/libsimaka/simaka_manager.c                     |    6 +-
 src/libsimaka/simaka_manager.h                     |    8 +-
 src/libsimaka/simaka_message.c                     |   26 +-
 src/libsimaka/simaka_message.h                     |    4 +-
 src/libsimaka/simaka_provider.h                    |    4 +-
 src/libstrongswan/Makefile.am                      |    4 +-
 src/libstrongswan/Makefile.in                      |  117 +-
 src/libstrongswan/asn1/asn1.c                      |    6 +-
 src/libstrongswan/asn1/asn1.h                      |    4 +-
 src/libstrongswan/asn1/oid.c                       |  891 ++--
 src/libstrongswan/asn1/oid.h                       |  431 +-
 src/libstrongswan/asn1/oid.txt                     |    1 +
 src/libstrongswan/bio/bio_reader.c                 |   58 +-
 src/libstrongswan/bio/bio_reader.h                 |   26 +-
 src/libstrongswan/bio/bio_writer.c                 |   14 +-
 src/libstrongswan/bio/bio_writer.h                 |   12 +-
 src/libstrongswan/collections/array.c              |   20 +-
 src/libstrongswan/collections/array.h              |    2 +-
 src/libstrongswan/credentials/auth_cfg.h           |    2 +-
 src/libstrongswan/credentials/containers/pkcs12.c  |   10 +-
 src/libstrongswan/credentials/containers/pkcs12.h  |    2 +-
 src/libstrongswan/credentials/sets/mem_cred.c      |    1 +
 src/libstrongswan/crypto/crypto_factory.c          |    4 +
 src/libstrongswan/crypto/hashers/hasher.h          |    2 +-
 src/libstrongswan/crypto/iv/iv_gen.h               |    6 +-
 src/libstrongswan/crypto/iv/iv_gen_null.c          |    4 +-
 src/libstrongswan/crypto/iv/iv_gen_rand.c          |    4 +-
 src/libstrongswan/crypto/iv/iv_gen_seq.c           |   28 +-
 src/libstrongswan/crypto/mac.h                     |    2 +-
 src/libstrongswan/crypto/mgf1/mgf1.c               |    2 +-
 src/libstrongswan/crypto/nonce_gen.h               |    2 +-
 src/libstrongswan/crypto/pkcs5.c                   |   12 +-
 src/libstrongswan/crypto/prf_plus.c                |    4 +-
 src/libstrongswan/crypto/prf_plus.h                |    2 +-
 src/libstrongswan/crypto/prfs/mac_prf.c            |    2 +-
 src/libstrongswan/crypto/prfs/prf.h                |    2 +-
 .../crypto/proposal/proposal_keywords.c            |    2 +-
 .../crypto/proposal/proposal_keywords.h            |    8 +-
 .../crypto/proposal/proposal_keywords_static.c     |  298 +-
 .../crypto/proposal/proposal_keywords_static.txt   |    5 +-
 src/libstrongswan/crypto/rngs/rng.c                |    4 +-
 src/libstrongswan/crypto/rngs/rng.h                |    4 +-
 src/libstrongswan/crypto/signers/mac_signer.c      |    8 +-
 src/libstrongswan/crypto/signers/signer.h          |    2 +-
 src/libstrongswan/eap/eap.h                        |   12 +-
 src/libstrongswan/ipsec/ipsec_types.c              |   16 +
 src/libstrongswan/ipsec/ipsec_types.h              |   29 +-
 src/libstrongswan/networking/host.c                |   20 +-
 src/libstrongswan/networking/host.h                |   12 +-
 src/libstrongswan/networking/packet.c              |    6 +-
 src/libstrongswan/networking/packet.h              |    4 +-
 src/libstrongswan/networking/tun_device.c          |   16 +-
 src/libstrongswan/networking/tun_device.h          |    4 +-
 src/libstrongswan/pen/pen.h                        |    6 +-
 src/libstrongswan/plugins/acert/Makefile.in        |   27 +-
 src/libstrongswan/plugins/aes/Makefile.in          |   27 +-
 src/libstrongswan/plugins/aes/aes_crypter.c        |   82 +-
 src/libstrongswan/plugins/aesni/Makefile.in        |   27 +-
 src/libstrongswan/plugins/aesni/aesni_ccm.c        |    8 +-
 src/libstrongswan/plugins/aesni/aesni_cmac.c       |    2 +-
 src/libstrongswan/plugins/aesni/aesni_ctr.c        |    2 +-
 src/libstrongswan/plugins/aesni/aesni_gcm.c        |    2 +-
 src/libstrongswan/plugins/aesni/aesni_xcbc.c       |    2 +-
 src/libstrongswan/plugins/af_alg/Makefile.in       |   27 +-
 src/libstrongswan/plugins/af_alg/af_alg_hasher.c   |    2 +-
 src/libstrongswan/plugins/af_alg/af_alg_ops.c      |    2 +-
 src/libstrongswan/plugins/af_alg/af_alg_ops.h      |    2 +-
 src/libstrongswan/plugins/af_alg/af_alg_plugin.c   |   19 +
 src/libstrongswan/plugins/af_alg/af_alg_prf.c      |    2 +-
 src/libstrongswan/plugins/af_alg/af_alg_signer.c   |    2 +-
 src/libstrongswan/plugins/agent/Makefile.in        |   27 +-
 .../plugins/agent/agent_private_key.c              |   20 +-
 src/libstrongswan/plugins/bliss/Makefile.in        |   27 +-
 src/libstrongswan/plugins/bliss/tests/Makefile.in  |   27 +-
 src/libstrongswan/plugins/blowfish/Makefile.in     |   27 +-
 .../plugins/blowfish/blowfish_crypter.c            |    6 +-
 src/libstrongswan/plugins/ccm/Makefile.in          |   27 +-
 src/libstrongswan/plugins/ccm/ccm_aead.c           |    6 +-
 src/libstrongswan/plugins/chapoly/Makefile.in      |   27 +-
 src/libstrongswan/plugins/chapoly/chapoly_aead.c   |    8 +-
 .../plugins/chapoly/chapoly_drv_portable.c         |   42 +-
 .../plugins/chapoly/chapoly_drv_ssse3.c            |   66 +-
 src/libstrongswan/plugins/cmac/Makefile.in         |   27 +-
 src/libstrongswan/plugins/cmac/cmac.c              |   16 +-
 src/libstrongswan/plugins/constraints/Makefile.in  |   27 +-
 src/libstrongswan/plugins/ctr/Makefile.in          |   27 +-
 src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.c  |    2 +-
 src/libstrongswan/plugins/curl/Makefile.in         |   27 +-
 src/libstrongswan/plugins/curl/curl_plugin.c       |    5 +-
 src/libstrongswan/plugins/des/Makefile.in          |   27 +-
 src/libstrongswan/plugins/des/des_crypter.c        |   14 +-
 src/libstrongswan/plugins/dnskey/Makefile.in       |   27 +-
 src/libstrongswan/plugins/dnskey/dnskey_builder.c  |    8 +-
 src/libstrongswan/plugins/files/Makefile.in        |   27 +-
 src/libstrongswan/plugins/fips_prf/Makefile.in     |   27 +-
 src/libstrongswan/plugins/fips_prf/fips_prf.c      |   26 +-
 src/libstrongswan/plugins/gcm/Makefile.in          |   27 +-
 src/libstrongswan/plugins/gcm/gcm_aead.c           |    4 +-
 src/libstrongswan/plugins/gcrypt/Makefile.in       |   27 +-
 src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c  |    2 +-
 src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c   |    2 +-
 src/libstrongswan/plugins/gcrypt/gcrypt_rng.c      |    2 +-
 src/libstrongswan/plugins/gmp/Makefile.in          |   27 +-
 .../plugins/gmp/gmp_rsa_private_key.c              |    2 +-
 src/libstrongswan/plugins/hmac/Makefile.in         |   27 +-
 src/libstrongswan/plugins/hmac/hmac.c              |    8 +-
 src/libstrongswan/plugins/keychain/Makefile.in     |   27 +-
 src/libstrongswan/plugins/ldap/Makefile.in         |   27 +-
 src/libstrongswan/plugins/md4/Makefile.in          |   27 +-
 src/libstrongswan/plugins/md4/md4_hasher.c         |   48 +-
 src/libstrongswan/plugins/md5/Makefile.in          |   27 +-
 src/libstrongswan/plugins/md5/md5_hasher.c         |   52 +-
 src/libstrongswan/plugins/mysql/Makefile.in        |   27 +-
 src/libstrongswan/plugins/nonce/Makefile.in        |   27 +-
 src/libstrongswan/plugins/nonce/nonce_nonceg.c     |    2 +-
 src/libstrongswan/plugins/ntru/Makefile.in         |   27 +-
 src/libstrongswan/plugins/ntru/ntru_drbg.c         |   14 +-
 src/libstrongswan/plugins/ntru/ntru_drbg.h         |    8 +-
 src/libstrongswan/plugins/ntru/ntru_ke.c           |    4 +-
 src/libstrongswan/plugins/openssl/Makefile.in      |   27 +-
 src/libstrongswan/plugins/openssl/openssl_crl.c    |   49 +-
 .../plugins/openssl/openssl_crypter.c              |   55 +-
 .../plugins/openssl/openssl_diffie_hellman.c       |   56 +-
 .../plugins/openssl/openssl_ec_private_key.c       |   10 +-
 .../plugins/openssl/openssl_ec_public_key.c        |   19 +-
 src/libstrongswan/plugins/openssl/openssl_gcm.c    |   26 +-
 src/libstrongswan/plugins/openssl/openssl_hasher.c |    4 +-
 src/libstrongswan/plugins/openssl/openssl_hmac.c   |   36 +-
 src/libstrongswan/plugins/openssl/openssl_pkcs12.c |    6 +-
 src/libstrongswan/plugins/openssl/openssl_pkcs7.c  |   12 +-
 src/libstrongswan/plugins/openssl/openssl_plugin.c |   41 +-
 src/libstrongswan/plugins/openssl/openssl_rng.c    |    9 +-
 .../plugins/openssl/openssl_rsa_private_key.c      |   41 +-
 .../plugins/openssl/openssl_rsa_public_key.c       |   27 +-
 .../plugins/openssl/openssl_sha1_prf.c             |    4 +-
 src/libstrongswan/plugins/openssl/openssl_util.c   |   15 +-
 src/libstrongswan/plugins/openssl/openssl_util.h   |   43 +-
 src/libstrongswan/plugins/openssl/openssl_x509.c   |   60 +-
 src/libstrongswan/plugins/padlock/Makefile.in      |   27 +-
 src/libstrongswan/plugins/padlock/padlock_rng.c    |    2 +-
 .../plugins/padlock/padlock_sha1_hasher.c          |   10 +-
 src/libstrongswan/plugins/pem/Makefile.in          |   27 +-
 src/libstrongswan/plugins/pem/pem_builder.c        |    2 +-
 src/libstrongswan/plugins/pgp/Makefile.in          |   27 +-
 src/libstrongswan/plugins/pgp/pgp_builder.c        |    6 +-
 src/libstrongswan/plugins/pgp/pgp_cert.c           |    8 +-
 src/libstrongswan/plugins/pgp/pgp_utils.c          |   10 +-
 src/libstrongswan/plugins/pgp/pgp_utils.h          |    2 +-
 src/libstrongswan/plugins/pkcs1/Makefile.in        |   27 +-
 src/libstrongswan/plugins/pkcs11/Makefile.in       |   27 +-
 src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c   |    2 +-
 .../plugins/pkcs11/pkcs11_private_key.c            |   12 +-
 src/libstrongswan/plugins/pkcs11/pkcs11_rng.c      |    2 +-
 src/libstrongswan/plugins/pkcs12/Makefile.in       |   27 +-
 src/libstrongswan/plugins/pkcs12/pkcs12_decode.c   |    4 +-
 src/libstrongswan/plugins/pkcs7/Makefile.in        |   27 +-
 src/libstrongswan/plugins/pkcs8/Makefile.in        |   27 +-
 src/libstrongswan/plugins/plugin_feature.c         |    2 +-
 src/libstrongswan/plugins/plugin_feature.h         |    2 +-
 src/libstrongswan/plugins/plugin_loader.c          |   34 +-
 src/libstrongswan/plugins/pubkey/Makefile.in       |   27 +-
 src/libstrongswan/plugins/random/Makefile.in       |   27 +-
 src/libstrongswan/plugins/random/random_rng.c      |    2 +-
 src/libstrongswan/plugins/rc2/Makefile.in          |   27 +-
 src/libstrongswan/plugins/rc2/rc2_crypter.c        |   20 +-
 src/libstrongswan/plugins/rdrand/Makefile.in       |   27 +-
 src/libstrongswan/plugins/rdrand/rdrand_rng.c      |   76 +-
 src/libstrongswan/plugins/revocation/Makefile.in   |   27 +-
 src/libstrongswan/plugins/sha1/Makefile.in         |   27 +-
 src/libstrongswan/plugins/sha1/sha1_hasher.c       |   34 +-
 src/libstrongswan/plugins/sha1/sha1_prf.c          |   16 +-
 src/libstrongswan/plugins/sha2/Makefile.in         |   27 +-
 src/libstrongswan/plugins/sha2/sha2_hasher.c       |   58 +-
 src/libstrongswan/plugins/sha3/Makefile.in         |   27 +-
 src/libstrongswan/plugins/soup/Makefile.in         |   27 +-
 src/libstrongswan/plugins/sqlite/Makefile.in       |   27 +-
 src/libstrongswan/plugins/sshkey/Makefile.in       |   27 +-
 src/libstrongswan/plugins/test_vectors/Makefile.in |   27 +-
 src/libstrongswan/plugins/unbound/Makefile.in      |   27 +-
 src/libstrongswan/plugins/winhttp/Makefile.in      |   27 +-
 .../plugins/winhttp/winhttp_fetcher.c              |    2 +-
 src/libstrongswan/plugins/x509/Makefile.in         |   27 +-
 src/libstrongswan/plugins/x509/x509_ac.c           |    3 +-
 src/libstrongswan/plugins/xcbc/Makefile.in         |   27 +-
 src/libstrongswan/plugins/xcbc/xcbc.c              |   16 +-
 src/libstrongswan/processing/jobs/job.h            |    2 +-
 src/libstrongswan/processing/scheduler.c           |    4 +-
 src/libstrongswan/processing/scheduler.h           |    4 +-
 src/libstrongswan/selectors/traffic_selector.c     |   80 +-
 src/libstrongswan/selectors/traffic_selector.h     |   36 +-
 src/libstrongswan/settings/settings.c              |   14 +-
 src/libstrongswan/settings/settings.h              |   10 +-
 src/libstrongswan/settings/settings_lexer.c        |  233 +-
 src/libstrongswan/settings/settings_parser.c       |   44 +-
 src/libstrongswan/settings/settings_parser.h       |    8 +-
 src/libstrongswan/tests/Makefile.am                |    2 +-
 src/libstrongswan/tests/Makefile.in                |   31 +-
 src/libstrongswan/tests/suites/test_array.c        |    2 +-
 src/libstrongswan/tests/suites/test_asn1.c         |    6 +-
 src/libstrongswan/tests/suites/test_bio_reader.c   |   20 +-
 src/libstrongswan/tests/suites/test_chunk.c        |   38 +-
 src/libstrongswan/tests/suites/test_host.c         |    6 +-
 src/libstrongswan/tests/suites/test_iv_gen.c       |   32 +-
 src/libstrongswan/tests/suites/test_ntru.c         |    8 +-
 src/libstrongswan/tests/suites/test_printf.c       |   12 +-
 .../tests/suites/test_traffic_selector.c           |   40 +-
 src/libstrongswan/tests/suites/test_utils.c        |   96 +-
 src/libstrongswan/tests/test_runner.c              |   30 +-
 src/libstrongswan/tests/test_runner.h              |    4 +
 src/libstrongswan/tests/utils/test_rng.c           |    2 +-
 src/libstrongswan/threading/thread.c               |   26 +-
 src/libstrongswan/utils/chunk.c                    |   62 +-
 src/libstrongswan/utils/chunk.h                    |   18 +-
 src/libstrongswan/utils/compat/android.h           |   17 +
 src/libstrongswan/utils/cpu_feature.c              |    2 +-
 src/libstrongswan/utils/identification.c           |    9 +-
 src/libstrongswan/utils/identification.h           |    2 +
 src/libstrongswan/utils/integrity_checker.c        |   10 +-
 src/libstrongswan/utils/integrity_checker.h        |    8 +-
 src/libstrongswan/utils/leak_detective.c           |   34 +-
 src/libstrongswan/utils/utils.c                    |    2 +-
 src/libstrongswan/utils/utils/align.c              |    6 +-
 src/libstrongswan/utils/utils/align.h              |    2 +-
 src/libstrongswan/utils/utils/byteorder.h          |   47 +-
 src/libstrongswan/utils/utils/memory.c             |    2 +-
 src/libstrongswan/utils/utils/memory.h             |    2 +-
 src/libstrongswan/utils/utils/string.h             |    8 +-
 src/libstrongswan/utils/utils/time.c               |    2 +-
 src/libstrongswan/utils/utils/types.h              |   15 +-
 src/libtls/Makefile.in                             |   28 +-
 src/libtls/tests/Makefile.in                       |   27 +-
 src/libtls/tests/suites/test_socket.c              |    4 +-
 src/libtls/tls.c                                   |    6 +-
 src/libtls/tls_aead.c                              |   16 +-
 src/libtls/tls_aead.h                              |    4 +-
 src/libtls/tls_aead_expl.c                         |   16 +-
 src/libtls/tls_aead_impl.c                         |   16 +-
 src/libtls/tls_aead_null.c                         |   12 +-
 src/libtls/tls_crypto.c                            |    6 +-
 src/libtls/tls_fragmentation.c                     |    6 +-
 src/libtls/tls_peer.c                              |   10 +-
 src/libtls/tls_protection.c                        |    4 +-
 src/libtls/tls_server.c                            |    8 +-
 src/libtnccs/Makefile.in                           |   27 +-
 src/libtnccs/plugins/tnc_imc/Makefile.in           |   27 +-
 src/libtnccs/plugins/tnc_imv/Makefile.in           |   27 +-
 src/libtnccs/plugins/tnc_tnccs/Makefile.in         |   27 +-
 src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_manager.c |   14 +-
 src/libtnccs/plugins/tnccs_11/Makefile.in          |   27 +-
 src/libtnccs/plugins/tnccs_11/tnccs_11.c           |   10 +-
 src/libtnccs/plugins/tnccs_20/Makefile.in          |   27 +-
 src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c |   16 +-
 .../messages/ietf/pb_access_recommendation_msg.c   |   10 +-
 .../messages/ietf/pb_access_recommendation_msg.h   |    4 +-
 .../messages/ietf/pb_assessment_result_msg.c       |    8 +-
 .../messages/ietf/pb_assessment_result_msg.h       |    4 +-
 .../plugins/tnccs_20/messages/ietf/pb_error_msg.c  |   30 +-
 .../plugins/tnccs_20/messages/ietf/pb_error_msg.h  |   16 +-
 .../tnccs_20/messages/ietf/pb_experimental_msg.c   |    2 +-
 .../messages/ietf/pb_language_preference_msg.c     |    2 +-
 .../plugins/tnccs_20/messages/ietf/pb_pa_msg.c     |   16 +-
 .../plugins/tnccs_20/messages/ietf/pb_pa_msg.h     |    8 +-
 .../tnccs_20/messages/ietf/pb_reason_string_msg.c  |    2 +-
 .../messages/ietf/pb_remediation_parameters_msg.c  |    4 +-
 .../messages/ita/pb_mutual_capability_msg.c        |    2 +-
 .../tnccs_20/messages/ita/pb_noskip_test_msg.c     |    2 +-
 .../plugins/tnccs_20/messages/pb_tnc_msg.h         |    4 +-
 .../tnccs_20/messages/tcg/pb_pdp_referral_msg.c    |   12 +-
 .../tnccs_20/messages/tcg/pb_pdp_referral_msg.h    |    6 +-
 src/libtnccs/plugins/tnccs_20/tnccs_20.c           |    8 +-
 src/libtnccs/plugins/tnccs_20/tnccs_20_client.c    |   14 +-
 src/libtnccs/plugins/tnccs_20/tnccs_20_client.h    |    2 +-
 src/libtnccs/plugins/tnccs_20/tnccs_20_server.c    |    6 +-
 src/libtnccs/plugins/tnccs_dynamic/Makefile.in     |   27 +-
 src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic.c |    8 +-
 src/libtnccs/tnc/tnccs/tnccs.h                     |    6 +-
 src/libtnccs/tnc/tnccs/tnccs_manager.h             |    2 +-
 src/libtncif/Makefile.in                           |   27 +-
 src/libtncif/tncif_identity.c                      |    4 +-
 src/libtpmtss/Makefile.am                          |   25 +
 src/{libsimaka => libtpmtss}/Makefile.in           |   82 +-
 .../ita/ita_comp_tboot.h => libtpmtss/tpm_tss.c}   |   47 +-
 src/libtpmtss/tpm_tss.h                            |  140 +
 src/libtpmtss/tpm_tss_quote_info.c                 |  330 ++
 src/libtpmtss/tpm_tss_quote_info.h                 |  151 +
 src/libtpmtss/tpm_tss_trousers.c                   |  655 +++
 src/libtpmtss/tpm_tss_trousers.h                   |   52 +
 src/libtpmtss/tpm_tss_tss2.c                       |  696 +++
 .../libcharon_tests.h => libtpmtss/tpm_tss_tss2.h} |   23 +-
 src/libtpmtss/tpm_tss_tss2_names.c                 |  123 +
 .../tpm_tss_tss2_names.h}                          |   22 +-
 src/manager/Makefile.in                            |   27 +-
 src/manager/controller/control_controller.c        |    4 +-
 src/manager/gateway.c                              |    2 +-
 src/manager/gateway.h                              |    2 +-
 src/medsrv/Makefile.in                             |   27 +-
 src/pki/Makefile.am                                |    2 +-
 src/pki/Makefile.in                                |   32 +-
 src/pki/man/Makefile.in                            |   40 +-
 src/pool/Makefile.in                               |   28 +-
 src/pool/sqlite.sql                                |    2 +-
 src/pt-tls-client/Makefile.in                      |   27 +-
 src/pt-tls-client/pt-tls-client.c                  |    2 +-
 src/scepclient/Makefile.in                         |   28 +-
 src/starter/Makefile.am                            |    5 +-
 src/starter/Makefile.in                            |   38 +-
 src/starter/confread.c                             |    2 +-
 src/starter/confread.h                             |   20 +-
 src/starter/parser/lexer.c                         |  233 +-
 src/starter/parser/parser.c                        |   40 +-
 src/starter/parser/parser.h                        |    8 +-
 src/starter/tests/Makefile.in                      |   27 +-
 src/stroke/Makefile.in                             |   27 +-
 src/stroke/stroke_msg.h                            |   32 +-
 src/swanctl/Makefile.am                            |    2 +-
 src/swanctl/Makefile.in                            |   35 +-
 src/swanctl/commands/list_conns.c                  |  112 +-
 src/swanctl/commands/list_sas.c                    |    7 +-
 src/swanctl/commands/load_authorities.c            |    2 +-
 src/swanctl/commands/load_conns.c                  |    2 +-
 src/swanctl/commands/load_pools.c                  |    2 +-
 src/swanctl/swanctl.conf                           |    6 +
 src/swanctl/swanctl.conf.5.main                    |   14 +-
 src/swanctl/swanctl.opt                            |   12 +-
 testing/Makefile.in                                |   26 +-
 testing/config/kernel/config-4.0                   |   17 +-
 testing/config/kernel/config-4.1                   |   17 +-
 testing/config/kernel/config-4.2                   |   18 +-
 testing/config/kernel/{config-4.2 => config-4.3}   |   97 +-
 testing/config/kernel/{config-4.2 => config-4.4}   |  134 +-
 testing/config/kernel/{config-4.2 => config-4.5}   |  181 +-
 testing/config/kernel/{config-4.2 => config-4.6}   |  236 +-
 testing/do-tests                                   |   28 +-
 testing/hosts/default/etc/fstab                    |    1 +
 testing/hosts/default/etc/ssh/sshd_config          |    1 +
 .../hosts/default/usr/local/bin/expect-connection  |    2 +-
 .../testresults-as-text.conf}                      |    0
 .../etc/apache2/sites-available/000-default.conf   |   12 +
 .../{001-ocsp_vhost => 001-ocsp_vhost.conf}        |   33 +-
 testing/hosts/winnetou/etc/openssl/generate-crl    |    4 +
 testing/scripts/build-baseimage                    |   60 +-
 testing/scripts/build-guestimages                  |   14 +-
 testing/scripts/chroot                             |   67 +
 testing/scripts/function.sh                        |    8 +
 testing/scripts/recipes/002_tnc-fhh.mk             |    9 +-
 testing/scripts/recipes/003_freeradius.mk          |    2 +-
 .../{004_wpa_supplicant.mk => 004_hostapd.mk}      |    8 +-
 testing/scripts/recipes/004_wpa_supplicant.mk      |    2 +-
 testing/scripts/recipes/011_openssl-fips.mk        |   23 -
 testing/scripts/recipes/012_openssl.mk             |   13 -
 testing/scripts/recipes/patches/freeradius-tnc-fhh |    4 +-
 testing/scripts/recipes/patches/hostapd-config     |   38 +
 testing/scripts/recipes/patches/tnc-fhh-tncsim     |   12 +
 testing/testing.conf                               |   20 +-
 testing/tests/af-alg/alg-camellia/evaltest.dat     |    2 +-
 testing/tests/af-alg/rw-cert/evaltest.dat          |    4 +-
 .../tests/gcrypt-ikev1/alg-serpent/evaltest.dat    |   12 +-
 .../alg-serpent/hosts/carol/etc/strongswan.conf    |    9 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   16 +-
 .../alg-serpent/hosts/moon/etc/strongswan.conf     |    9 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   24 +
 .../tests/gcrypt-ikev1/alg-serpent/posttest.dat    |    4 +-
 testing/tests/gcrypt-ikev1/alg-serpent/pretest.dat |    9 +-
 testing/tests/gcrypt-ikev1/alg-serpent/test.conf   |    3 +
 .../tests/gcrypt-ikev1/alg-twofish/evaltest.dat    |   12 +-
 .../alg-twofish/hosts/carol/etc/ipsec.conf         |   21 -
 .../alg-twofish/hosts/carol/etc/strongswan.conf    |    9 +-
 .../hosts/carol/etc/swanctl/swanctl.conf           |   16 +-
 .../alg-twofish/hosts/moon/etc/ipsec.conf          |   21 -
 .../alg-twofish/hosts/moon/etc/strongswan.conf     |    9 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |   24 +
 .../tests/gcrypt-ikev1/alg-twofish/posttest.dat    |    4 +-
 testing/tests/gcrypt-ikev1/alg-twofish/pretest.dat |    9 +-
 testing/tests/gcrypt-ikev1/alg-twofish/test.conf   |    3 +
 .../tests/gcrypt-ikev2/alg-camellia/evaltest.dat   |    2 +-
 .../tests/gcrypt-ikev2/alg-camellia/pretest.dat    |    1 +
 testing/tests/gcrypt-ikev2/rw-cert/evaltest.dat    |    4 +-
 testing/tests/ha/active-passive/evaltest.dat       |    8 +-
 testing/tests/ha/both-active/evaltest.dat          |    4 +-
 testing/tests/ike/rw-cert/evaltest.dat             |    4 +-
 testing/tests/ike/rw-cert/pretest.dat              |    3 +-
 testing/tests/ike/rw_v1-net_v2/evaltest.dat        |    4 +-
 testing/tests/ike/rw_v1-net_v2/pretest.dat         |    1 +
 testing/tests/ikev1/alg-3des-md5/evaltest.dat      |    2 +-
 testing/tests/ikev1/alg-3des-md5/pretest.dat       |    3 +-
 testing/tests/ikev1/alg-blowfish/evaltest.dat      |    4 +-
 testing/tests/ikev1/alg-blowfish/pretest.dat       |    3 +-
 testing/tests/ikev1/alg-modp-subgroup/evaltest.dat |    4 +-
 testing/tests/ikev1/alg-modp-subgroup/pretest.dat  |    3 +-
 testing/tests/ikev1/alg-sha256/evaltest.dat        |    2 +-
 testing/tests/ikev1/alg-sha256/pretest.dat         |    1 +
 testing/tests/ikev1/alg-sha384/evaltest.dat        |    2 +-
 testing/tests/ikev1/alg-sha384/pretest.dat         |    1 +
 testing/tests/ikev1/alg-sha512/evaltest.dat        |    2 +-
 testing/tests/ikev1/alg-sha512/pretest.dat         |    1 +
 testing/tests/ikev1/compress/pretest.dat           |    3 +-
 .../tests/ikev1/config-payload-push/evaltest.dat   |    8 +-
 .../tests/ikev1/config-payload-push/pretest.dat    |    5 +-
 testing/tests/ikev1/config-payload/evaltest.dat    |    8 +-
 testing/tests/ikev1/config-payload/pretest.dat     |    5 +-
 testing/tests/ikev1/double-nat-net/evaltest.dat    |    6 +-
 testing/tests/ikev1/double-nat-net/pretest.dat     |    3 +-
 testing/tests/ikev1/double-nat/evaltest.dat        |    6 +-
 testing/tests/ikev1/double-nat/pretest.dat         |    3 +-
 testing/tests/ikev1/dpd-clear/pretest.dat          |    1 +
 testing/tests/ikev1/dpd-restart/pretest.dat        |    1 +
 testing/tests/ikev1/dynamic-initiator/evaltest.dat |    2 +-
 testing/tests/ikev1/dynamic-initiator/pretest.dat  |    3 +-
 testing/tests/ikev1/dynamic-responder/evaltest.dat |    2 +-
 testing/tests/ikev1/dynamic-responder/pretest.dat  |    1 +
 testing/tests/ikev1/dynamic-two-peers/evaltest.dat |    4 +-
 testing/tests/ikev1/dynamic-two-peers/pretest.dat  |    3 +-
 testing/tests/ikev1/esp-alg-aes-ccm/evaltest.dat   |    2 +-
 testing/tests/ikev1/esp-alg-aes-ccm/pretest.dat    |    1 +
 testing/tests/ikev1/esp-alg-aes-ctr/evaltest.dat   |    2 +-
 testing/tests/ikev1/esp-alg-aes-ctr/pretest.dat    |    1 +
 testing/tests/ikev1/esp-alg-aes-gcm/evaltest.dat   |    2 +-
 testing/tests/ikev1/esp-alg-aes-gcm/pretest.dat    |    1 +
 testing/tests/ikev1/esp-alg-aes-gmac/evaltest.dat  |    2 +-
 testing/tests/ikev1/esp-alg-aes-gmac/pretest.dat   |    1 +
 testing/tests/ikev1/esp-alg-aes-xcbc/evaltest.dat  |    2 +-
 testing/tests/ikev1/esp-alg-aes-xcbc/pretest.dat   |    3 +-
 testing/tests/ikev1/esp-alg-null/evaltest.dat      |    2 +-
 testing/tests/ikev1/esp-alg-null/pretest.dat       |    1 +
 testing/tests/ikev1/host2host-ah/evaltest.dat      |    2 +-
 testing/tests/ikev1/host2host-ah/pretest.dat       |    3 +-
 testing/tests/ikev1/host2host-cert/evaltest.dat    |    2 +-
 testing/tests/ikev1/host2host-cert/pretest.dat     |    3 +-
 .../tests/ikev1/host2host-transport/evaltest.dat   |    2 +-
 .../tests/ikev1/host2host-transport/pretest.dat    |    3 +-
 testing/tests/ikev1/ip-pool-db/evaltest.dat        |    4 +-
 testing/tests/ikev1/ip-pool-db/pretest.dat         |    1 +
 testing/tests/ikev1/ip-pool/evaltest.dat           |    4 +-
 testing/tests/ikev1/ip-pool/pretest.dat            |    3 +-
 .../tests/ikev1/multi-level-ca-cr-init/pretest.dat |    3 +-
 .../tests/ikev1/multi-level-ca-cr-resp/pretest.dat |    3 +-
 testing/tests/ikev1/multi-level-ca/pretest.dat     |    5 +-
 testing/tests/ikev1/nat-rw/evaltest.dat            |   14 +-
 testing/tests/ikev1/nat-rw/pretest.dat             |    3 +-
 testing/tests/ikev1/nat-virtual-ip/evaltest.dat    |    2 +-
 testing/tests/ikev1/nat-virtual-ip/pretest.dat     |    3 +-
 testing/tests/ikev1/net2net-ah/evaltest.dat        |    2 +-
 testing/tests/ikev1/net2net-ah/pretest.dat         |    1 +
 testing/tests/ikev1/net2net-cert/evaltest.dat      |    2 +-
 testing/tests/ikev1/net2net-cert/pretest.dat       |    1 +
 testing/tests/ikev1/net2net-esn/description.txt    |    7 +
 testing/tests/ikev1/net2net-esn/evaltest.dat       |   17 +
 .../net2net-esn}/hosts/moon/etc/ipsec.conf         |   15 +-
 .../hosts/moon/etc/strongswan.conf                 |    0
 .../net2net-esn/hosts/sun}/etc/ipsec.conf          |   17 +-
 .../hosts/sun}/etc/strongswan.conf                 |    0
 .../{net2net-cert => net2net-esn}/posttest.dat     |    0
 .../{nat-virtual-ip => net2net-esn}/pretest.dat    |    3 +-
 .../ikev1/{net2net-ah => net2net-esn}/test.conf    |    0
 .../tests/ikev1/net2net-fragmentation/evaltest.dat |    2 +-
 .../tests/ikev1/net2net-fragmentation/pretest.dat  |    1 +
 testing/tests/ikev1/net2net-ntru-cert/evaltest.dat |    2 +-
 testing/tests/ikev1/net2net-ntru-cert/pretest.dat  |    3 +-
 testing/tests/ikev1/net2net-psk-fail/pretest.dat   |    1 +
 testing/tests/ikev1/net2net-psk/evaltest.dat       |    2 +-
 testing/tests/ikev1/net2net-psk/pretest.dat        |    1 +
 testing/tests/ikev1/protoport-dual/evaltest.dat    |    4 +-
 testing/tests/ikev1/protoport-dual/pretest.dat     |    2 +
 .../tests/ikev1/rw-cert-aggressive/evaltest.dat    |    4 +-
 testing/tests/ikev1/rw-cert-aggressive/pretest.dat |    1 +
 testing/tests/ikev1/rw-cert-unity/evaltest.dat     |    2 +-
 testing/tests/ikev1/rw-cert-unity/pretest.dat      |    1 +
 testing/tests/ikev1/rw-cert/evaltest.dat           |    4 +-
 testing/tests/ikev1/rw-initiator-only/evaltest.dat |    2 +-
 testing/tests/ikev1/rw-initiator-only/pretest.dat  |    1 +
 testing/tests/ikev1/rw-ntru-psk/evaltest.dat       |    4 +-
 testing/tests/ikev1/rw-ntru-psk/pretest.dat        |    2 +
 testing/tests/ikev1/rw-psk-aggressive/evaltest.dat |    4 +-
 testing/tests/ikev1/rw-psk-aggressive/pretest.dat  |    1 +
 testing/tests/ikev1/rw-psk-fqdn/evaltest.dat       |    4 +-
 testing/tests/ikev1/rw-psk-fqdn/pretest.dat        |    2 +
 testing/tests/ikev1/rw-psk-ipv4/evaltest.dat       |    4 +-
 testing/tests/ikev1/rw-psk-ipv4/pretest.dat        |    2 +
 testing/tests/ikev1/virtual-ip/evaltest.dat        |   12 +-
 testing/tests/ikev1/virtual-ip/pretest.dat         |    3 +-
 .../tests/ikev1/xauth-id-psk-config/evaltest.dat   |    4 +-
 .../tests/ikev1/xauth-id-psk-config/pretest.dat    |    1 +
 .../ikev1/xauth-id-rsa-aggressive/evaltest.dat     |    4 +-
 .../ikev1/xauth-id-rsa-aggressive/pretest.dat      |    1 +
 .../tests/ikev1/xauth-id-rsa-config/evaltest.dat   |    4 +-
 .../tests/ikev1/xauth-id-rsa-config/pretest.dat    |    2 +
 .../tests/ikev1/xauth-id-rsa-hybrid/evaltest.dat   |    4 +-
 .../tests/ikev1/xauth-id-rsa-hybrid/pretest.dat    |    1 +
 testing/tests/ikev1/xauth-psk/evaltest.dat         |    4 +-
 testing/tests/ikev1/xauth-psk/pretest.dat          |    1 +
 .../ikev1/xauth-rsa-eap-md5-radius/evaltest.dat    |    2 +-
 .../ikev1/xauth-rsa-eap-md5-radius/pretest.dat     |    1 +
 testing/tests/ikev1/xauth-rsa-radius/evaltest.dat  |    2 +-
 testing/tests/ikev1/xauth-rsa-radius/pretest.dat   |    1 +
 testing/tests/ikev1/xauth-rsa/evaltest.dat         |    4 +-
 testing/tests/ikev1/xauth-rsa/pretest.dat          |    1 +
 testing/tests/ikev2/acert-cached/evaltest.dat      |    4 +-
 testing/tests/ikev2/acert-cached/pretest.dat       |    1 +
 testing/tests/ikev2/acert-fallback/evaltest.dat    |    4 +-
 testing/tests/ikev2/acert-fallback/pretest.dat     |    2 +
 testing/tests/ikev2/acert-inline/evaltest.dat      |    4 +-
 testing/tests/ikev2/acert-inline/pretest.dat       |    1 +
 testing/tests/ikev2/after-2038-certs/evaltest.dat  |    2 +-
 testing/tests/ikev2/after-2038-certs/pretest.dat   |    1 +
 testing/tests/ikev2/alg-3des-md5/evaltest.dat      |    2 +-
 testing/tests/ikev2/alg-3des-md5/pretest.dat       |    1 +
 testing/tests/ikev2/alg-aes-ccm/evaltest.dat       |    2 +-
 testing/tests/ikev2/alg-aes-ccm/pretest.dat        |    1 +
 testing/tests/ikev2/alg-aes-ctr/evaltest.dat       |    2 +-
 testing/tests/ikev2/alg-aes-ctr/pretest.dat        |    1 +
 testing/tests/ikev2/alg-aes-gcm/evaltest.dat       |    2 +-
 testing/tests/ikev2/alg-aes-gcm/pretest.dat        |    1 +
 testing/tests/ikev2/alg-aes-xcbc/evaltest.dat      |    2 +-
 testing/tests/ikev2/alg-aes-xcbc/pretest.dat       |    1 +
 testing/tests/ikev2/alg-blowfish/evaltest.dat      |    4 +-
 testing/tests/ikev2/alg-blowfish/pretest.dat       |    1 +
 .../tests/ikev2/alg-chacha20poly1305/evaltest.dat  |    2 +-
 .../tests/ikev2/alg-chacha20poly1305/pretest.dat   |    1 +
 testing/tests/ikev2/alg-modp-subgroup/evaltest.dat |    4 +-
 testing/tests/ikev2/alg-modp-subgroup/pretest.dat  |    1 +
 testing/tests/ikev2/alg-sha256-96/evaltest.dat     |    2 +-
 testing/tests/ikev2/alg-sha256-96/pretest.dat      |    1 +
 testing/tests/ikev2/alg-sha256/evaltest.dat        |    2 +-
 testing/tests/ikev2/alg-sha256/pretest.dat         |    1 +
 testing/tests/ikev2/alg-sha384/evaltest.dat        |    2 +-
 testing/tests/ikev2/alg-sha384/pretest.dat         |    1 +
 testing/tests/ikev2/alg-sha512/evaltest.dat        |    2 +-
 testing/tests/ikev2/alg-sha512/pretest.dat         |    1 +
 testing/tests/ikev2/any-interface/pretest.dat      |    2 +
 testing/tests/ikev2/compress-nat/evaltest.dat      |   12 +-
 testing/tests/ikev2/compress/pretest.dat           |    1 +
 .../ikev2/config-payload-swapped/evaltest.dat      |    4 +-
 .../tests/ikev2/config-payload-swapped/pretest.dat |    3 +-
 testing/tests/ikev2/config-payload/evaltest.dat    |    8 +-
 testing/tests/ikev2/config-payload/pretest.dat     |    3 +-
 testing/tests/ikev2/critical-extension/pretest.dat |    1 +
 testing/tests/ikev2/crl-from-cache/pretest.dat     |    1 +
 testing/tests/ikev2/crl-ldap/pretest.dat           |    1 +
 testing/tests/ikev2/crl-revoked/pretest.dat        |    1 +
 testing/tests/ikev2/crl-to-cache/pretest.dat       |    1 +
 testing/tests/ikev2/default-keys/evaltest.dat      |    2 +-
 testing/tests/ikev2/default-keys/pretest.dat       |    1 +
 testing/tests/ikev2/dhcp-dynamic/evaltest.dat      |    8 +-
 testing/tests/ikev2/dhcp-dynamic/posttest.dat      |    2 +-
 testing/tests/ikev2/dhcp-dynamic/pretest.dat       |    5 +-
 .../tests/ikev2/dhcp-static-client-id/evaltest.dat |    8 +-
 .../tests/ikev2/dhcp-static-client-id/posttest.dat |    2 +-
 .../tests/ikev2/dhcp-static-client-id/pretest.dat  |    7 +-
 testing/tests/ikev2/dhcp-static-mac/evaltest.dat   |    8 +-
 testing/tests/ikev2/dhcp-static-mac/posttest.dat   |    2 +-
 testing/tests/ikev2/dhcp-static-mac/pretest.dat    |    5 +-
 testing/tests/ikev2/double-nat-net/evaltest.dat    |    6 +-
 testing/tests/ikev2/double-nat-net/pretest.dat     |    1 +
 testing/tests/ikev2/double-nat/evaltest.dat        |    6 +-
 testing/tests/ikev2/double-nat/pretest.dat         |    1 +
 testing/tests/ikev2/dpd-clear/pretest.dat          |    1 +
 testing/tests/ikev2/dpd-hold/pretest.dat           |    1 +
 testing/tests/ikev2/dpd-restart/pretest.dat        |    1 +
 testing/tests/ikev2/dynamic-initiator/evaltest.dat |    2 +-
 testing/tests/ikev2/dynamic-initiator/pretest.dat  |    3 +-
 testing/tests/ikev2/dynamic-two-peers/evaltest.dat |    4 +-
 testing/tests/ikev2/dynamic-two-peers/pretest.dat  |    3 +-
 testing/tests/ikev2/esp-alg-aes-gmac/evaltest.dat  |    2 +-
 testing/tests/ikev2/esp-alg-aes-gmac/pretest.dat   |    1 +
 testing/tests/ikev2/esp-alg-md5-128/evaltest.dat   |    2 +-
 testing/tests/ikev2/esp-alg-md5-128/pretest.dat    |    1 +
 testing/tests/ikev2/esp-alg-null/evaltest.dat      |    2 +-
 testing/tests/ikev2/esp-alg-null/pretest.dat       |    1 +
 testing/tests/ikev2/esp-alg-sha1-160/evaltest.dat  |    2 +-
 testing/tests/ikev2/esp-alg-sha1-160/pretest.dat   |    1 +
 testing/tests/ikev2/farp/evaltest.dat              |    8 +-
 testing/tests/ikev2/farp/pretest.dat               |    3 +-
 testing/tests/ikev2/force-udp-encaps/evaltest.dat  |    6 +-
 testing/tests/ikev2/force-udp-encaps/pretest.dat   |    1 +
 testing/tests/ikev2/forecast/pretest.dat           |    3 +-
 testing/tests/ikev2/host2host-ah/evaltest.dat      |    2 +-
 testing/tests/ikev2/host2host-ah/pretest.dat       |    3 +-
 testing/tests/ikev2/host2host-cert/evaltest.dat    |    2 +-
 testing/tests/ikev2/host2host-cert/pretest.dat     |    3 +-
 testing/tests/ikev2/host2host-swapped/evaltest.dat |    2 +-
 testing/tests/ikev2/host2host-swapped/pretest.dat  |    3 +-
 .../host2host-transport-connmark/evaltest.dat      |    1 +
 .../ikev2/host2host-transport-connmark/pretest.dat |    5 +-
 .../ikev2/host2host-transport-nat/evaltest.dat     |    4 +-
 .../ikev2/host2host-transport-nat/pretest.dat      |    5 +-
 .../tests/ikev2/host2host-transport/evaltest.dat   |    2 +-
 .../tests/ikev2/host2host-transport/pretest.dat    |    3 +-
 .../tests/ikev2/inactivity-timeout/evaltest.dat    |    4 +-
 testing/tests/ikev2/inactivity-timeout/pretest.dat |    1 +
 testing/tests/ikev2/ip-pool-db/evaltest.dat        |    4 +-
 testing/tests/ikev2/ip-pool-db/pretest.dat         |    1 +
 testing/tests/ikev2/ip-pool-wish/evaltest.dat      |    4 +-
 testing/tests/ikev2/ip-pool-wish/pretest.dat       |    3 +-
 testing/tests/ikev2/ip-pool/evaltest.dat           |    4 +-
 testing/tests/ikev2/ip-pool/pretest.dat            |    3 +-
 testing/tests/ikev2/ip-split-pools-db/pretest.dat  |    3 +-
 testing/tests/ikev2/ip-two-pools-db/evaltest.dat   |    8 +-
 testing/tests/ikev2/ip-two-pools-db/pretest.dat    |    2 +
 .../tests/ikev2/ip-two-pools-mixed/evaltest.dat    |    4 +-
 testing/tests/ikev2/ip-two-pools-mixed/pretest.dat |    2 +
 .../tests/ikev2/ip-two-pools-v4v6-db/evaltest.dat  |    2 +-
 .../tests/ikev2/ip-two-pools-v4v6-db/pretest.dat   |    1 +
 testing/tests/ikev2/ip-two-pools-v4v6/evaltest.dat |    2 +-
 testing/tests/ikev2/ip-two-pools-v4v6/pretest.dat  |    1 +
 testing/tests/ikev2/ip-two-pools/evaltest.dat      |    4 +-
 testing/tests/ikev2/ip-two-pools/pretest.dat       |    2 +
 testing/tests/ikev2/lookip/evaltest.dat            |    4 +-
 testing/tests/ikev2/lookip/pretest.dat             |    2 +
 testing/tests/ikev2/mobike-nat/evaltest.dat        |    4 +-
 testing/tests/ikev2/mobike-nat/pretest.dat         |    1 +
 testing/tests/ikev2/mobike-virtual-ip/evaltest.dat |    4 +-
 testing/tests/ikev2/mobike-virtual-ip/pretest.dat  |    1 +
 testing/tests/ikev2/mobike/evaltest.dat            |    4 +-
 testing/tests/ikev2/mobike/pretest.dat             |    1 +
 .../ikev2/mult-auth-rsa-eap-sim-id/evaltest.dat    |    4 +-
 .../ikev2/mult-auth-rsa-eap-sim-id/pretest.dat     |    1 +
 .../tests/ikev2/multi-level-ca-cr-init/pretest.dat |    2 +
 .../tests/ikev2/multi-level-ca-cr-resp/pretest.dat |    4 +-
 .../tests/ikev2/multi-level-ca-ldap/pretest.dat    |    2 +
 .../tests/ikev2/multi-level-ca-loop/pretest.dat    |    1 +
 .../tests/ikev2/multi-level-ca-pathlen/pretest.dat |    1 +
 .../tests/ikev2/multi-level-ca-revoked/pretest.dat |    1 +
 .../tests/ikev2/multi-level-ca-strict/pretest.dat  |    4 +-
 testing/tests/ikev2/multi-level-ca/pretest.dat     |    4 +-
 testing/tests/ikev2/nat-rw-mark/evaltest.dat       |   12 +-
 testing/tests/ikev2/nat-rw-mark/pretest.dat        |    2 +
 testing/tests/ikev2/nat-rw-psk/evaltest.dat        |    8 +-
 testing/tests/ikev2/nat-rw-psk/pretest.dat         |    1 +
 testing/tests/ikev2/nat-rw/evaltest.dat            |   14 +-
 testing/tests/ikev2/nat-rw/pretest.dat             |    3 +-
 testing/tests/ikev2/nat-virtual-ip/evaltest.dat    |    2 +-
 testing/tests/ikev2/nat-virtual-ip/pretest.dat     |    1 +
 testing/tests/ikev2/net2net-ah/evaltest.dat        |    2 +-
 testing/tests/ikev2/net2net-ah/pretest.dat         |    3 +-
 testing/tests/ikev2/net2net-cert-sha2/evaltest.dat |    2 +-
 testing/tests/ikev2/net2net-cert-sha2/pretest.dat  |    3 +-
 testing/tests/ikev2/net2net-cert/evaltest.dat      |    2 +-
 testing/tests/ikev2/net2net-cert/pretest.dat       |    3 +-
 testing/tests/ikev2/net2net-dnscert/evaltest.dat   |    2 +-
 testing/tests/ikev2/net2net-dnscert/pretest.dat    |    3 +-
 testing/tests/ikev2/net2net-dnssec/evaltest.dat    |    2 +-
 testing/tests/ikev2/net2net-dnssec/pretest.dat     |    3 +-
 testing/tests/ikev2/net2net-esn/pretest.dat        |    3 +-
 .../tests/ikev2/net2net-fragmentation/evaltest.dat |    2 +-
 .../tests/ikev2/net2net-fragmentation/pretest.dat  |    3 +-
 .../ikev2/net2net-ntru-bandwidth/evaltest.dat      |    2 +-
 .../tests/ikev2/net2net-ntru-bandwidth/pretest.dat |    3 +-
 testing/tests/ikev2/net2net-ntru-cert/evaltest.dat |    2 +-
 testing/tests/ikev2/net2net-ntru-cert/pretest.dat  |    3 +-
 testing/tests/ikev2/net2net-pgp-v3/evaltest.dat    |    2 +-
 testing/tests/ikev2/net2net-pgp-v3/pretest.dat     |    3 +-
 testing/tests/ikev2/net2net-pgp-v4/evaltest.dat    |    2 +-
 testing/tests/ikev2/net2net-pgp-v4/pretest.dat     |    3 +-
 testing/tests/ikev2/net2net-pkcs12/evaltest.dat    |    2 +-
 testing/tests/ikev2/net2net-pkcs12/pretest.dat     |    3 +-
 testing/tests/ikev2/net2net-psk-dscp/evaltest.dat  |    4 +-
 testing/tests/ikev2/net2net-psk-dscp/pretest.dat   |    5 +-
 testing/tests/ikev2/net2net-psk-fail/pretest.dat   |    3 +-
 testing/tests/ikev2/net2net-psk/evaltest.dat       |    2 +-
 testing/tests/ikev2/net2net-psk/pretest.dat        |    3 +-
 testing/tests/ikev2/net2net-pubkey/evaltest.dat    |    2 +-
 testing/tests/ikev2/net2net-pubkey/pretest.dat     |    3 +-
 testing/tests/ikev2/net2net-rfc3779/evaltest.dat   |    2 +-
 testing/tests/ikev2/net2net-rfc3779/pretest.dat    |    1 +
 testing/tests/ikev2/net2net-route/evaltest.dat     |    2 +-
 testing/tests/ikev2/net2net-route/pretest.dat      |    1 +
 testing/tests/ikev2/net2net-rsa/evaltest.dat       |    2 +-
 testing/tests/ikev2/net2net-rsa/pretest.dat        |    3 +-
 testing/tests/ikev2/net2net-same-nets/evaltest.dat |    4 +-
 testing/tests/ikev2/net2net-same-nets/pretest.dat  |    1 +
 testing/tests/ikev2/net2net-start/evaltest.dat     |    2 +-
 testing/tests/ikev2/ocsp-local-cert/pretest.dat    |    1 +
 testing/tests/ikev2/ocsp-multi-level/pretest.dat   |    3 +-
 .../tests/ikev2/ocsp-no-signer-cert/pretest.dat    |    1 +
 testing/tests/ikev2/ocsp-revoked/pretest.dat       |    1 +
 testing/tests/ikev2/ocsp-root-cert/pretest.dat     |    1 +
 testing/tests/ikev2/ocsp-signer-cert/pretest.dat   |    1 +
 testing/tests/ikev2/ocsp-strict-ifuri/pretest.dat  |    3 +-
 testing/tests/ikev2/ocsp-timeouts-good/pretest.dat |    1 +
 .../tests/ikev2/ocsp-timeouts-unknown/pretest.dat  |    1 +
 .../tests/ikev2/ocsp-untrusted-cert/pretest.dat    |    1 +
 testing/tests/ikev2/protoport-dual/evaltest.dat    |    4 +-
 testing/tests/ikev2/protoport-dual/pretest.dat     |    2 +
 testing/tests/ikev2/protoport-route/evaltest.dat   |    4 +-
 testing/tests/ikev2/protoport-route/pretest.dat    |    2 +
 testing/tests/ikev2/reauth-early/evaltest.dat      |    2 +-
 testing/tests/ikev2/reauth-early/pretest.dat       |    1 +
 testing/tests/ikev2/reauth-late/evaltest.dat       |    2 +-
 testing/tests/ikev2/reauth-late/pretest.dat        |    1 +
 testing/tests/ikev2/reauth-mbb-revoked/pretest.dat |    1 +
 .../tests/ikev2/reauth-mbb-virtual-ip/pretest.dat  |    1 +
 testing/tests/ikev2/reauth-mbb/pretest.dat         |    1 +
 testing/tests/ikev2/redirect-active/evaltest.dat   |    8 +-
 testing/tests/ikev2/redirect-active/pretest.dat    |    5 +-
 testing/tests/ikev2/rw-cert/evaltest.dat           |    4 +-
 testing/tests/ikev2/rw-dnssec/evaltest.dat         |    4 +-
 testing/tests/ikev2/rw-dnssec/posttest.dat         |   12 +-
 testing/tests/ikev2/rw-dnssec/pretest.dat          |    1 +
 testing/tests/ikev2/rw-eap-aka-id-rsa/evaltest.dat |    2 +-
 testing/tests/ikev2/rw-eap-aka-id-rsa/pretest.dat  |    1 +
 testing/tests/ikev2/rw-eap-aka-rsa/evaltest.dat    |    2 +-
 testing/tests/ikev2/rw-eap-aka-rsa/pretest.dat     |    1 +
 testing/tests/ikev2/rw-eap-dynamic/evaltest.dat    |    4 +-
 testing/tests/ikev2/rw-eap-dynamic/pretest.dat     |    1 +
 .../ikev2/rw-eap-framed-ip-radius/evaltest.dat     |    4 +-
 .../ikev2/rw-eap-framed-ip-radius/pretest.dat      |    1 +
 .../ikev2/rw-eap-md5-class-radius/evaltest.dat     |    4 +-
 .../ikev2/rw-eap-md5-class-radius/pretest.dat      |    2 +
 .../tests/ikev2/rw-eap-md5-id-prompt/evaltest.dat  |    2 +-
 .../tests/ikev2/rw-eap-md5-id-prompt/pretest.dat   |    1 +
 .../tests/ikev2/rw-eap-md5-id-radius/evaltest.dat  |    2 +-
 .../tests/ikev2/rw-eap-md5-id-radius/pretest.dat   |    1 +
 testing/tests/ikev2/rw-eap-md5-radius/evaltest.dat |    2 +-
 testing/tests/ikev2/rw-eap-md5-radius/pretest.dat  |    1 +
 testing/tests/ikev2/rw-eap-md5-rsa/evaltest.dat    |    2 +-
 testing/tests/ikev2/rw-eap-md5-rsa/pretest.dat     |    1 +
 .../ikev2/rw-eap-mschapv2-id-rsa/evaltest.dat      |    2 +-
 .../tests/ikev2/rw-eap-mschapv2-id-rsa/pretest.dat |    1 +
 testing/tests/ikev2/rw-eap-peap-md5/evaltest.dat   |    2 +-
 testing/tests/ikev2/rw-eap-peap-md5/pretest.dat    |    1 +
 .../tests/ikev2/rw-eap-peap-mschapv2/evaltest.dat  |    2 +-
 .../tests/ikev2/rw-eap-peap-mschapv2/pretest.dat   |    1 +
 .../tests/ikev2/rw-eap-peap-radius/evaltest.dat    |    2 +-
 testing/tests/ikev2/rw-eap-peap-radius/pretest.dat |    1 +
 .../tests/ikev2/rw-eap-sim-id-radius/evaltest.dat  |    2 +-
 .../tests/ikev2/rw-eap-sim-id-radius/pretest.dat   |    1 +
 .../ikev2/rw-eap-sim-only-radius/evaltest.dat      |    4 +-
 .../tests/ikev2/rw-eap-sim-only-radius/pretest.dat |    1 +
 testing/tests/ikev2/rw-eap-sim-radius/evaltest.dat |    4 +-
 testing/tests/ikev2/rw-eap-sim-radius/pretest.dat  |    1 +
 testing/tests/ikev2/rw-eap-sim-rsa/evaltest.dat    |    2 +-
 testing/tests/ikev2/rw-eap-sim-rsa/pretest.dat     |    1 +
 .../tests/ikev2/rw-eap-tls-fragments/evaltest.dat  |    2 +-
 .../tests/ikev2/rw-eap-tls-fragments/pretest.dat   |    1 +
 testing/tests/ikev2/rw-eap-tls-only/evaltest.dat   |    2 +-
 testing/tests/ikev2/rw-eap-tls-only/pretest.dat    |    1 +
 testing/tests/ikev2/rw-eap-tls-radius/evaltest.dat |    2 +-
 .../hosts/carol/etc/strongswan.conf                |    3 +
 testing/tests/ikev2/rw-eap-tls-radius/pretest.dat  |    1 +
 testing/tests/ikev2/rw-eap-ttls-only/evaltest.dat  |    2 +-
 testing/tests/ikev2/rw-eap-ttls-only/pretest.dat   |    1 +
 .../rw-eap-ttls-phase2-piggyback/evaltest.dat      |    2 +-
 .../ikev2/rw-eap-ttls-phase2-piggyback/pretest.dat |    1 +
 .../tests/ikev2/rw-eap-ttls-radius/evaltest.dat    |    2 +-
 testing/tests/ikev2/rw-eap-ttls-radius/pretest.dat |    1 +
 testing/tests/ikev2/rw-hash-and-url/evaltest.dat   |    4 +-
 testing/tests/ikev2/rw-hash-and-url/pretest.dat    |    1 +
 testing/tests/ikev2/rw-initiator-only/evaltest.dat |    2 +-
 testing/tests/ikev2/rw-initiator-only/pretest.dat  |    3 +-
 testing/tests/ikev2/rw-mark-in-out/evaltest.dat    |    4 +-
 testing/tests/ikev2/rw-mark-in-out/pretest.dat     |    3 +-
 testing/tests/ikev2/rw-ntru-bliss/evaltest.dat     |    4 +-
 testing/tests/ikev2/rw-ntru-bliss/pretest.dat      |    3 +-
 testing/tests/ikev2/rw-ntru-psk/evaltest.dat       |    4 +-
 testing/tests/ikev2/rw-ntru-psk/pretest.dat        |    1 +
 testing/tests/ikev2/rw-pkcs8/evaltest.dat          |    4 +-
 testing/tests/ikev2/rw-pkcs8/pretest.dat           |    1 +
 testing/tests/ikev2/rw-psk-fqdn/evaltest.dat       |    4 +-
 testing/tests/ikev2/rw-psk-fqdn/pretest.dat        |    1 +
 testing/tests/ikev2/rw-psk-ipv4/evaltest.dat       |    4 +-
 testing/tests/ikev2/rw-psk-ipv4/pretest.dat        |    1 +
 testing/tests/ikev2/rw-psk-no-idr/evaltest.dat     |    4 +-
 testing/tests/ikev2/rw-psk-no-idr/pretest.dat      |    1 +
 testing/tests/ikev2/rw-psk-rsa-mixed/evaltest.dat  |    4 +-
 testing/tests/ikev2/rw-psk-rsa-mixed/pretest.dat   |    2 +
 testing/tests/ikev2/rw-psk-rsa-split/evaltest.dat  |    4 +-
 testing/tests/ikev2/rw-psk-rsa-split/pretest.dat   |    1 +
 .../tests/ikev2/rw-radius-accounting/pretest.dat   |    1 +
 testing/tests/ikev2/rw-sig-auth/evaltest.dat       |    4 +-
 testing/tests/ikev2/rw-sig-auth/pretest.dat        |    2 +
 testing/tests/ikev2/rw-whitelist/evaltest.dat      |    4 +-
 .../tests/ikev2/shunt-policies-nat-rw/evaltest.dat |   12 +-
 testing/tests/ikev2/strong-keys-certs/evaltest.dat |    4 +-
 testing/tests/ikev2/strong-keys-certs/pretest.dat  |    1 +
 testing/tests/ikev2/trap-any/evaltest.dat          |   12 +-
 testing/tests/ikev2/two-certs/evaltest.dat         |    4 +-
 testing/tests/ikev2/two-certs/pretest.dat          |    2 +
 .../tests/ikev2/virtual-ip-override/pretest.dat    |    3 +-
 testing/tests/ikev2/virtual-ip/evaltest.dat        |   12 +-
 testing/tests/ikev2/virtual-ip/pretest.dat         |    3 +-
 testing/tests/ikev2/wildcards/pretest.dat          |    2 +
 .../ipv6/net2net-ip4-in-ip6-ikev1/evaltest.dat     |    2 +-
 .../ipv6/net2net-ip4-in-ip6-ikev2/evaltest.dat     |    2 +-
 testing/tests/libipsec/host2host-cert/evaltest.dat |    6 +-
 .../libipsec/host2host-cert/hosts/moon/etc/updown  |   31 +
 .../libipsec/host2host-cert/hosts/sun/etc/updown   |   31 +
 testing/tests/libipsec/host2host-cert/pretest.dat  |    3 +-
 testing/tests/libipsec/net2net-3des/evaltest.dat   |    6 +-
 .../libipsec/net2net-3des/hosts/moon/etc/updown    |   31 +
 .../libipsec/net2net-3des/hosts/sun/etc/updown     |   31 +
 testing/tests/libipsec/net2net-3des/pretest.dat    |    3 +-
 testing/tests/libipsec/net2net-cert/evaltest.dat   |    6 +-
 .../libipsec/net2net-cert/hosts/moon/etc/updown    |   31 +
 .../libipsec/net2net-cert/hosts/sun/etc/updown     |   31 +
 testing/tests/libipsec/net2net-cert/pretest.dat    |    3 +-
 testing/tests/libipsec/net2net-null/evaltest.dat   |    6 +-
 .../libipsec/net2net-null/hosts/moon/etc/updown    |   31 +
 .../libipsec/net2net-null/hosts/sun/etc/updown     |   31 +
 testing/tests/libipsec/net2net-null/pretest.dat    |    3 +-
 testing/tests/libipsec/rw-suite-b/evaltest.dat     |   12 +-
 .../libipsec/rw-suite-b/hosts/carol/etc/updown     |   31 +
 .../libipsec/rw-suite-b/hosts/dave/etc/updown      |   31 +
 .../libipsec/rw-suite-b/hosts/moon/etc/updown      |   31 +
 .../tests/openssl-ikev1/alg-camellia/evaltest.dat  |    2 +-
 .../tests/openssl-ikev1/alg-camellia/pretest.dat   |    1 +
 .../tests/openssl-ikev1/alg-ecp-high/evaltest.dat  |    4 +-
 .../tests/openssl-ikev1/alg-ecp-high/pretest.dat   |    1 +
 .../tests/openssl-ikev1/alg-ecp-low/evaltest.dat   |    4 +-
 .../tests/openssl-ikev1/alg-ecp-low/pretest.dat    |    1 +
 .../tests/openssl-ikev1/ecdsa-certs/evaltest.dat   |    4 +-
 .../tests/openssl-ikev1/ecdsa-certs/pretest.dat    |    1 +
 .../tests/openssl-ikev2/alg-aes-gcm/evaltest.dat   |    4 +-
 .../tests/openssl-ikev2/alg-aes-gcm/pretest.dat    |    1 +
 .../tests/openssl-ikev2/alg-blowfish/evaltest.dat  |    4 +-
 .../tests/openssl-ikev2/alg-blowfish/pretest.dat   |    1 +
 .../tests/openssl-ikev2/alg-camellia/evaltest.dat  |    2 +-
 .../tests/openssl-ikev2/alg-camellia/pretest.dat   |    1 +
 .../alg-ecp-brainpool-high/evaltest.dat            |    4 +-
 .../alg-ecp-brainpool-high/pretest.dat             |    1 +
 .../alg-ecp-brainpool-low/evaltest.dat             |    4 +-
 .../alg-ecp-brainpool-low/pretest.dat              |    1 +
 .../tests/openssl-ikev2/alg-ecp-high/evaltest.dat  |    4 +-
 .../tests/openssl-ikev2/alg-ecp-high/pretest.dat   |    1 +
 .../tests/openssl-ikev2/alg-ecp-low/evaltest.dat   |    4 +-
 .../tests/openssl-ikev2/alg-ecp-low/pretest.dat    |    1 +
 .../openssl-ikev2/critical-extension/pretest.dat   |    1 +
 .../tests/openssl-ikev2/ecdsa-certs/evaltest.dat   |    4 +-
 .../tests/openssl-ikev2/ecdsa-certs/pretest.dat    |    1 +
 .../tests/openssl-ikev2/ecdsa-pkcs8/evaltest.dat   |    4 +-
 .../tests/openssl-ikev2/ecdsa-pkcs8/pretest.dat    |    1 +
 .../openssl-ikev2/net2net-pgp-v3/evaltest.dat      |    2 +-
 .../tests/openssl-ikev2/net2net-pgp-v3/pretest.dat |    1 +
 .../openssl-ikev2/net2net-pkcs12/evaltest.dat      |    2 +-
 .../tests/openssl-ikev2/net2net-pkcs12/pretest.dat |    1 +
 testing/tests/openssl-ikev2/rw-cert/evaltest.dat   |    4 +-
 .../openssl-ikev2/rw-eap-tls-only/evaltest.dat     |    2 +-
 .../openssl-ikev2/rw-eap-tls-only/pretest.dat      |    1 +
 .../openssl-ikev2/rw-suite-b-128/evaltest.dat      |    2 +-
 .../openssl-ikev2/rw-suite-b-192/evaltest.dat      |    2 +-
 testing/tests/p2pnat/behind-same-nat/evaltest.dat  |    4 +-
 testing/tests/p2pnat/medsrv-psk/evaltest.dat       |    4 +-
 testing/tests/pfkey/alg-aes-xcbc/evaltest.dat      |    2 +-
 testing/tests/pfkey/alg-aes-xcbc/pretest.dat       |    1 +
 testing/tests/pfkey/alg-sha384/evaltest.dat        |    2 +-
 testing/tests/pfkey/alg-sha384/pretest.dat         |    1 +
 testing/tests/pfkey/alg-sha512/evaltest.dat        |    2 +-
 testing/tests/pfkey/alg-sha512/pretest.dat         |    1 +
 testing/tests/pfkey/compress/pretest.dat           |    1 +
 testing/tests/pfkey/esp-alg-null/evaltest.dat      |    2 +-
 testing/tests/pfkey/esp-alg-null/pretest.dat       |    1 +
 .../tests/pfkey/host2host-transport/evaltest.dat   |    2 +-
 .../tests/pfkey/host2host-transport/pretest.dat    |    1 +
 testing/tests/pfkey/nat-rw/evaltest.dat            |    8 +-
 testing/tests/pfkey/nat-rw/pretest.dat             |    3 +-
 testing/tests/pfkey/net2net-route/evaltest.dat     |    2 +-
 testing/tests/pfkey/net2net-route/pretest.dat      |    1 +
 testing/tests/pfkey/protoport-dual/evaltest.dat    |    4 +-
 testing/tests/pfkey/protoport-dual/pretest.dat     |    2 +
 testing/tests/pfkey/protoport-route/evaltest.dat   |    4 +-
 testing/tests/pfkey/protoport-route/pretest.dat    |    2 +
 testing/tests/pfkey/rw-cert/evaltest.dat           |    4 +-
 .../tests/pfkey/shunt-policies-nat-rw/evaltest.dat |   12 +-
 testing/tests/sql/ip-pool-db-expired/evaltest.dat  |    4 +-
 testing/tests/sql/ip-pool-db-restart/evaltest.dat  |    4 +-
 testing/tests/sql/ip-pool-db/evaltest.dat          |    4 +-
 testing/tests/sql/ip-split-pools-db/evaltest.dat   |    4 +-
 testing/tests/sql/multi-level-ca/evaltest.dat      |    4 +-
 testing/tests/sql/net2net-cert/evaltest.dat        |    2 +-
 testing/tests/sql/net2net-psk/evaltest.dat         |    2 +-
 testing/tests/sql/net2net-route-pem/evaltest.dat   |    4 +-
 testing/tests/sql/net2net-start-pem/evaltest.dat   |    4 +-
 testing/tests/sql/rw-cert/evaltest.dat             |    4 +-
 testing/tests/sql/rw-eap-aka-rsa/evaltest.dat      |    2 +-
 testing/tests/sql/rw-psk-ipv4/evaltest.dat         |    4 +-
 testing/tests/sql/rw-psk-rsa-split/evaltest.dat    |    4 +-
 testing/tests/sql/rw-rsa-keyid/evaltest.dat        |    4 +-
 testing/tests/sql/rw-rsa/evaltest.dat              |    4 +-
 .../tests/sql/shunt-policies-nat-rw/evaltest.dat   |   12 +-
 testing/tests/swanctl/config-payload/evaltest.dat  |    4 +-
 testing/tests/swanctl/dhcp-dynamic/evaltest.dat    |    8 +-
 testing/tests/swanctl/dhcp-dynamic/posttest.dat    |    2 +-
 testing/tests/swanctl/dhcp-dynamic/pretest.dat     |    2 +-
 testing/tests/swanctl/frags-ipv4/evaltest.dat      |    4 +-
 testing/tests/swanctl/ip-pool-db/evaltest.dat      |    4 +-
 testing/tests/swanctl/ip-pool/evaltest.dat         |    4 +-
 testing/tests/swanctl/manual-prio/description.txt  |    4 +
 .../{rw-hash-and-url => manual-prio}/evaltest.dat  |   22 +-
 .../hosts/carol/etc/strongswan.conf                |    0
 .../hosts/carol/etc/swanctl/swanctl.conf           |   31 +-
 .../hosts/dave}/etc/strongswan.conf                |    0
 .../hosts/dave/etc/swanctl/swanctl.conf            |   29 +-
 .../hosts/moon}/etc/strongswan.conf                |    0
 .../hosts/moon/etc/swanctl/swanctl.conf            |   66 +
 testing/tests/swanctl/manual-prio/posttest.dat     |    8 +
 .../{dhcp-dynamic => manual-prio}/pretest.dat      |    8 +-
 .../{rw-psk-ikev1 => manual-prio}/test.conf        |    0
 .../swanctl/mult-auth-rsa-eap-sim-id/evaltest.dat  |    4 +-
 testing/tests/swanctl/net2net-cert/evaltest.dat    |    2 +-
 .../hosts/moon/etc/swanctl/swanctl.conf            |    4 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |    4 +
 testing/tests/swanctl/net2net-gw/description.txt   |    7 +
 testing/tests/swanctl/net2net-gw/evaltest.dat      |    5 +
 .../net2net-gw/hosts/carol/etc/strongswan.conf     |   14 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   49 +
 .../net2net-gw/hosts/moon/etc/strongswan.conf      |   14 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |    9 +-
 .../net2net-gw/hosts/sun/etc/strongswan.conf       |   14 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |    9 +-
 testing/tests/swanctl/net2net-gw/posttest.dat      |    8 +
 .../{net2net-pubkey => net2net-gw}/pretest.dat     |   12 +-
 .../alg-serpent => swanctl/net2net-gw}/test.conf   |   11 +-
 testing/tests/swanctl/net2net-pubkey/evaltest.dat  |    2 +-
 testing/tests/swanctl/net2net-pubkey/pretest.dat   |    1 +
 testing/tests/swanctl/net2net-route/evaltest.dat   |    2 +-
 testing/tests/swanctl/net2net-start/evaltest.dat   |    2 +-
 testing/tests/swanctl/protoport-dual/evaltest.dat  |    4 +-
 testing/tests/swanctl/protoport-dual/pretest.dat   |    2 +
 testing/tests/swanctl/protoport-range/evaltest.dat |    4 +-
 testing/tests/swanctl/protoport-range/pretest.dat  |    3 +
 testing/tests/swanctl/rw-cert/evaltest.dat         |    4 +-
 testing/tests/swanctl/rw-dnssec/evaltest.dat       |    4 +-
 testing/tests/swanctl/rw-hash-and-url/evaltest.dat |    4 +-
 .../swanctl/rw-multi-ciphers-ikev1/description.txt |   15 +
 .../swanctl/rw-multi-ciphers-ikev1/evaltest.dat    |   12 +
 .../hosts/carol/etc/strongswan.conf                |   23 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   20 +-
 .../hosts/dave/etc/strongswan.conf                 |   23 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   20 +-
 .../hosts/moon/etc/strongswan.conf                 |   23 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   45 +
 .../rw-multi-ciphers-ikev1}/posttest.dat           |    0
 .../pretest.dat                                    |    5 +-
 .../test.conf                                      |    0
 testing/tests/swanctl/rw-ntru-bliss/evaltest.dat   |    4 +-
 testing/tests/swanctl/rw-psk-fqdn/evaltest.dat     |    4 +-
 testing/tests/swanctl/rw-psk-ikev1/evaltest.dat    |    8 +-
 testing/tests/swanctl/rw-psk-ipv4/evaltest.dat     |    4 +-
 testing/tests/swanctl/rw-pubkey-anon/evaltest.dat  |    4 +-
 testing/tests/swanctl/rw-pubkey-keyid/evaltest.dat |    4 +-
 .../swanctl/shunt-policies-nat-rw/evaltest.dat     |   12 +-
 testing/tests/swanctl/xauth-rsa/evaltest.dat       |   10 +-
 .../xauth-rsa/hosts/carol/etc/swanctl/swanctl.conf |    3 +-
 .../xauth-rsa/hosts/dave/etc/swanctl/swanctl.conf  |    3 +-
 .../xauth-rsa/hosts/moon/etc/swanctl/swanctl.conf  |    4 +-
 testing/tests/tkm/host2host-initiator/evaltest.dat |    2 +-
 testing/tests/tkm/host2host-responder/evaltest.dat |    2 +-
 testing/tests/tkm/host2host-xfrmproxy/evaltest.dat |    2 +-
 testing/tests/tkm/multiple-clients/evaltest.dat    |    4 +-
 testing/tests/tkm/net2net-initiator/evaltest.dat   |    2 +-
 testing/tests/tkm/net2net-xfrmproxy/evaltest.dat   |    2 +-
 testing/tests/tkm/xfrmproxy-expire/evaltest.dat    |    2 +-
 testing/tests/tnc/tnccs-11-fhh/evaltest.dat        |    8 +-
 .../tests/tnc/tnccs-11-radius-block/evaltest.dat   |    4 +-
 .../tests/tnc/tnccs-11-radius-block/pretest.dat    |    1 +
 testing/tests/tnc/tnccs-11-radius-pts/evaltest.dat |    8 +-
 .../hosts/alice/etc/strongswan.conf                |    2 +-
 testing/tests/tnc/tnccs-11-radius-pts/pretest.dat  |    2 +
 testing/tests/tnc/tnccs-11-radius/evaltest.dat     |    8 +-
 .../hosts/carol/etc/strongswan.conf                |    3 +
 testing/tests/tnc/tnccs-11-radius/pretest.dat      |    2 +
 testing/tests/tnc/tnccs-11/evaltest.dat            |    8 +-
 testing/tests/tnc/tnccs-11/pretest.dat             |    2 +
 testing/tests/tnc/tnccs-20-block/evaltest.dat      |    4 +-
 testing/tests/tnc/tnccs-20-block/pretest.dat       |    1 +
 .../tests/tnc/tnccs-20-client-retry/evaltest.dat   |    8 +-
 .../tests/tnc/tnccs-20-client-retry/pretest.dat    |    2 +
 testing/tests/tnc/tnccs-20-fail-init/pretest.dat   |    2 +
 testing/tests/tnc/tnccs-20-fail-resp/pretest.dat   |    2 +
 testing/tests/tnc/tnccs-20-fhh/evaltest.dat        |    8 +-
 .../hosts/alice/etc/strongswan.conf                |    2 +-
 testing/tests/tnc/tnccs-20-hcd-eap/pretest.dat     |    2 +
 .../tnc/tnccs-20-mutual-eap-fail/evaltest.dat      |    2 +-
 .../tests/tnc/tnccs-20-mutual-eap-fail/pretest.dat |    5 +-
 testing/tests/tnc/tnccs-20-mutual-eap/evaltest.dat |    2 +-
 testing/tests/tnc/tnccs-20-mutual-eap/pretest.dat  |    5 +-
 testing/tests/tnc/tnccs-20-os-pts/evaltest.dat     |    8 +-
 .../tnccs-20-os-pts/hosts/moon/etc/strongswan.conf |    2 +-
 testing/tests/tnc/tnccs-20-os-pts/pretest.dat      |    2 +
 testing/tests/tnc/tnccs-20-os/evaltest.dat         |    8 +-
 .../tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf |    2 +-
 testing/tests/tnc/tnccs-20-os/pretest.dat          |    2 +
 testing/tests/tnc/tnccs-20-pdp-eap/evaltest.dat    |    8 +-
 .../sites-available/{default => 000-default.conf}  |    9 +-
 .../alice/etc/apache2/sites-available/default      |   27 +-
 .../hosts/alice/etc/strongswan.conf                |    2 +-
 testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat     |    2 +
 .../etc/apache2/sites-available/000-default.conf}  |    9 +-
 .../alice/etc/apache2/sites-available/default      |   27 +-
 .../hosts/alice/etc/iptables.rules                 |    4 +-
 .../hosts/alice/etc/strongswan.conf                |    5 +-
 testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat  |    4 +-
 testing/tests/tnc/tnccs-20-pts-no-ecc/evaltest.dat |    8 +-
 .../hosts/moon/etc/strongswan.conf                 |    3 +-
 testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat  |    2 +
 testing/tests/tnc/tnccs-20-pts/evaltest.dat        |    8 +-
 .../tnccs-20-pts/hosts/moon/etc/strongswan.conf    |    2 +-
 testing/tests/tnc/tnccs-20-pts/pretest.dat         |    2 +
 .../tests/tnc/tnccs-20-server-retry/evaltest.dat   |    8 +-
 .../tests/tnc/tnccs-20-server-retry/pretest.dat    |    2 +
 testing/tests/tnc/tnccs-20-tls/evaltest.dat        |    8 +-
 testing/tests/tnc/tnccs-20-tls/pretest.dat         |    2 +
 testing/tests/tnc/tnccs-20/evaltest.dat            |    8 +-
 testing/tests/tnc/tnccs-20/pretest.dat             |    2 +
 testing/tests/tnc/tnccs-dynamic/evaltest.dat       |    8 +-
 testing/tests/tnc/tnccs-dynamic/pretest.dat        |    2 +
 ylwrap                                             |   28 +-
 1615 files changed, 32526 insertions(+), 15124 deletions(-)
 create mode 100644 src/aikpub2/Makefile.am
 copy src/{aikgen => aikpub2}/Makefile.in (93%)
 create mode 100644 src/aikpub2/aikpub2.c
 create mode 100644 src/libcharon/plugins/vici/python/README.rst
 copy src/libcharon/tests/{libcharon_tests.c => exchange_tests.c} (78%)
 copy src/libcharon/tests/{libcharon_tests.h => exchange_tests.h} (67%)
 create mode 100644 src/libcharon/tests/suites/test_child_create.c
 create mode 100644 src/libcharon/tests/suites/test_child_delete.c
 create mode 100644 src/libcharon/tests/suites/test_child_rekey.c
 create mode 100644 src/libcharon/tests/suites/test_ike_delete.c
 create mode 100644 src/libcharon/tests/suites/test_ike_rekey.c
 create mode 100644 src/libcharon/tests/suites/test_proposal.c
 create mode 100644 src/libcharon/tests/utils/exchange_test_asserts.c
 create mode 100644 src/libcharon/tests/utils/exchange_test_asserts.h
 create mode 100644 src/libcharon/tests/utils/exchange_test_helper.c
 create mode 100644 src/libcharon/tests/utils/exchange_test_helper.h
 create mode 100644 src/libcharon/tests/utils/job_asserts.h
 create mode 100644 src/libcharon/tests/utils/mock_dh.c
 copy src/{libimcv/pts/components/ita/ita_comp_ima.h => libcharon/tests/utils/mock_dh.h} (56%)
 create mode 100644 src/libcharon/tests/utils/mock_ipsec.c
 copy src/{libradius/radius_mppe.h => libcharon/tests/utils/mock_ipsec.h} (57%)
 copy src/{libstrongswan/plugins/nonce/nonce_nonceg.c => libcharon/tests/utils/mock_nonce_gen.c} (51%)
 copy src/{libimcv/pts/components/ita/ita_comp_ima.h => libcharon/tests/utils/mock_nonce_gen.h} (55%)
 create mode 100644 src/libcharon/tests/utils/mock_sender.c
 create mode 100644 src/libcharon/tests/utils/mock_sender.h
 create mode 100644 src/libcharon/tests/utils/sa_asserts.h
 delete mode 100644 src/libimcv/pts/pts_simple_evid_final.h
 create mode 100644 src/libtpmtss/Makefile.am
 copy src/{libsimaka => libtpmtss}/Makefile.in (91%)
 copy src/{libimcv/pts/components/ita/ita_comp_tboot.h => libtpmtss/tpm_tss.c} (51%)
 create mode 100644 src/libtpmtss/tpm_tss.h
 create mode 100644 src/libtpmtss/tpm_tss_quote_info.c
 create mode 100644 src/libtpmtss/tpm_tss_quote_info.h
 create mode 100644 src/libtpmtss/tpm_tss_trousers.c
 create mode 100644 src/libtpmtss/tpm_tss_trousers.h
 create mode 100644 src/libtpmtss/tpm_tss_tss2.c
 copy src/{libcharon/tests/libcharon_tests.h => libtpmtss/tpm_tss_tss2.h} (62%)
 create mode 100644 src/libtpmtss/tpm_tss_tss2_names.c
 copy src/{libcharon/tests/libcharon_tests.h => libtpmtss/tpm_tss_tss2_names.h} (60%)
 copy testing/config/kernel/{config-4.2 => config-4.3} (96%)
 copy testing/config/kernel/{config-4.2 => config-4.4} (95%)
 copy testing/config/kernel/{config-4.2 => config-4.5} (93%)
 copy testing/config/kernel/{config-4.2 => config-4.6} (91%)
 copy testing/hosts/winnetou/etc/apache2/{conf.d/testresults-as-text => conf-enabled/testresults-as-text.conf} (100%)
 create mode 100644 testing/hosts/winnetou/etc/apache2/sites-available/000-default.conf
 rename testing/hosts/winnetou/etc/apache2/sites-enabled/{001-ocsp_vhost => 001-ocsp_vhost.conf} (65%)
 create mode 100755 testing/scripts/chroot
 copy testing/scripts/recipes/{004_wpa_supplicant.mk => 004_hostapd.mk} (83%)
 delete mode 100644 testing/scripts/recipes/011_openssl-fips.mk
 delete mode 100644 testing/scripts/recipes/012_openssl.mk
 create mode 100644 testing/scripts/recipes/patches/hostapd-config
 create mode 100644 testing/scripts/recipes/patches/tnc-fhh-tncsim
 copy testing/tests/{swanctl/xauth-rsa => gcrypt-ikev1/alg-serpent}/hosts/carol/etc/swanctl/swanctl.conf (57%)
 create mode 100755 testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/swanctl/swanctl.conf
 delete mode 100644 testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/ipsec.conf
 copy testing/tests/{swanctl/xauth-rsa => gcrypt-ikev1/alg-twofish}/hosts/carol/etc/swanctl/swanctl.conf (57%)
 delete mode 100644 testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/ipsec.conf
 create mode 100755 testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/swanctl/swanctl.conf
 create mode 100644 testing/tests/ikev1/net2net-esn/description.txt
 create mode 100644 testing/tests/ikev1/net2net-esn/evaltest.dat
 rename testing/tests/{gcrypt-ikev1/alg-serpent => ikev1/net2net-esn}/hosts/moon/etc/ipsec.conf (59%)
 copy testing/tests/ikev1/{host2host-ah => net2net-esn}/hosts/moon/etc/strongswan.conf (100%)
 rename testing/tests/{gcrypt-ikev1/alg-serpent/hosts/carol => ikev1/net2net-esn/hosts/sun}/etc/ipsec.conf (54%)
 copy testing/tests/ikev1/{host2host-ah/hosts/moon => net2net-esn/hosts/sun}/etc/strongswan.conf (100%)
 copy testing/tests/ikev1/{net2net-cert => net2net-esn}/posttest.dat (100%)
 copy testing/tests/ikev1/{nat-virtual-ip => net2net-esn}/pretest.dat (85%)
 copy testing/tests/ikev1/{net2net-ah => net2net-esn}/test.conf (100%)
 create mode 100755 testing/tests/swanctl/manual-prio/description.txt
 copy testing/tests/swanctl/{rw-hash-and-url => manual-prio}/evaltest.dat (65%)
 copy testing/tests/swanctl/{config-payload => manual-prio}/hosts/carol/etc/strongswan.conf (100%)
 copy testing/tests/swanctl/{xauth-rsa => manual-prio}/hosts/carol/etc/swanctl/swanctl.conf (51%)
 copy testing/tests/swanctl/{config-payload/hosts/carol => manual-prio/hosts/dave}/etc/strongswan.conf (100%)
 copy testing/tests/swanctl/{xauth-rsa => manual-prio}/hosts/dave/etc/swanctl/swanctl.conf (55%)
 copy testing/tests/swanctl/{config-payload/hosts/carol => manual-prio/hosts/moon}/etc/strongswan.conf (100%)
 create mode 100755 testing/tests/swanctl/manual-prio/hosts/moon/etc/swanctl/swanctl.conf
 create mode 100755 testing/tests/swanctl/manual-prio/posttest.dat
 copy testing/tests/swanctl/{dhcp-dynamic => manual-prio}/pretest.dat (58%)
 mode change 100644 => 100755
 copy testing/tests/swanctl/{rw-psk-ikev1 => manual-prio}/test.conf (100%)
 create mode 100755 testing/tests/swanctl/net2net-gw/description.txt
 create mode 100755 testing/tests/swanctl/net2net-gw/evaltest.dat
 create mode 100755 testing/tests/swanctl/net2net-gw/hosts/carol/etc/strongswan.conf
 create mode 100755 testing/tests/swanctl/net2net-gw/hosts/carol/etc/swanctl/swanctl.conf
 create mode 100755 testing/tests/swanctl/net2net-gw/hosts/moon/etc/strongswan.conf
 copy testing/tests/swanctl/{net2net-cert => net2net-gw}/hosts/moon/etc/swanctl/swanctl.conf (71%)
 create mode 100755 testing/tests/swanctl/net2net-gw/hosts/sun/etc/strongswan.conf
 copy testing/tests/swanctl/{net2net-cert => net2net-gw}/hosts/sun/etc/swanctl/swanctl.conf (71%)
 create mode 100755 testing/tests/swanctl/net2net-gw/posttest.dat
 copy testing/tests/swanctl/{net2net-pubkey => net2net-gw}/pretest.dat (51%)
 mode change 100644 => 100755
 copy testing/tests/{gcrypt-ikev1/alg-serpent => swanctl/net2net-gw}/test.conf (66%)
 mode change 100644 => 100755
 create mode 100755 testing/tests/swanctl/rw-multi-ciphers-ikev1/description.txt
 create mode 100755 testing/tests/swanctl/rw-multi-ciphers-ikev1/evaltest.dat
 create mode 100755 testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/carol/etc/strongswan.conf
 copy testing/tests/swanctl/{xauth-rsa => rw-multi-ciphers-ikev1}/hosts/carol/etc/swanctl/swanctl.conf (54%)
 create mode 100755 testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/dave/etc/strongswan.conf
 copy testing/tests/swanctl/{xauth-rsa => rw-multi-ciphers-ikev1}/hosts/dave/etc/swanctl/swanctl.conf (51%)
 create mode 100755 testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf
 create mode 100755 testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/swanctl/swanctl.conf
 copy testing/tests/{af-alg/rw-cert => swanctl/rw-multi-ciphers-ikev1}/posttest.dat (100%)
 mode change 100644 => 100755
 copy testing/tests/swanctl/{dhcp-dynamic => rw-multi-ciphers-ikev1}/pretest.dat (78%)
 mode change 100644 => 100755
 copy testing/tests/swanctl/{rw-psk-ikev1 => rw-multi-ciphers-ikev1}/test.conf (100%)
 copy testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/{default => 000-default.conf} (70%)
 copy testing/tests/tnc/{tnccs-20-pdp-eap/hosts/alice/etc/apache2/sites-available/default => tnccs-20-pdp-pt-tls/hosts/alice/etc/apache2/sites-available/000-default.conf} (70%)

-- 
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