[Pkg-swan-devel] [strongswan] 01/02: Merge tag 'v5.2.0-1' into strongswan-wheezy-backports

Romain Francoise rfrancoise at moszumanska.debian.org
Tue Jul 22 18:23:32 UTC 2014


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

rfrancoise pushed a commit to branch strongswan-wheezy-backports
in repository strongswan.

commit 8328bad376ae2eb93218f0b502886ed6f464d52d
Merge: 4b1ac88 156e2f5
Author: Romain Francoise <rfrancoise at debian.org>
Date:   Tue Jul 22 20:08:45 2014 +0200

    Merge tag 'v5.2.0-1' into strongswan-wheezy-backports
    
    Tag strongSwan 5.2.0-1
    
    * tag 'v5.2.0-1':
      upload to unstable
      replace tools.conf by pki.conf and scepclient.conf.
      debian/patches: 03_pfkey-Always-include-stdint.h dropped, included upstream.
      New upstream release.
      Imported Upstream version 5.2.0
      po update
      Drop hardening-wrapper from build-depends
      Amend build-dep on libgcrypt to 'libgcrypt20-dev | libgcrypt11-dev'

 Android.common.mk                                  |    2 +-
 Android.mk                                         |    1 +
 Doxyfile.in                                        | 2346 ++++++++++-------
 Makefile.am                                        |    2 +-
 Makefile.in                                        |   21 +-
 NEWS                                               |   48 +
 README                                             | 1266 ++++-----
 aclocal.m4                                         |  139 +-
 conf/Makefile.am                                   |   10 +-
 conf/Makefile.in                                   |   38 +-
 conf/format-options.py                             |   51 +-
 conf/options/aikgen.conf                           |    7 +
 conf/options/aikgen.opt                            |    2 +
 conf/options/charon.conf                           |   20 +
 conf/options/charon.opt                            |   27 +
 conf/options/pki.conf                              |    7 +
 conf/options/pki.opt                               |    2 +
 conf/options/scepclient.conf                       |    7 +
 conf/options/scepclient.opt                        |    2 +
 conf/options/swanctl.conf                          |    7 +
 conf/options/swanctl.opt                           |    2 +
 conf/options/tools.conf                            |   14 -
 conf/options/tools.opt                             |    5 -
 conf/plugins/eap-tnc.conf                          |    2 +-
 conf/plugins/eap-tnc.opt                           |    2 +-
 conf/plugins/eap-ttls.conf                         |    3 +
 conf/plugins/eap-ttls.opt                          |    3 +
 conf/plugins/imc-attestation.conf                  |   21 -
 conf/plugins/imc-attestation.opt                   |   14 +-
 conf/plugins/imc-os.conf                           |    3 -
 conf/plugins/imc-os.opt                            |   14 +-
 conf/plugins/imc-scanner.conf                      |    3 -
 conf/plugins/imc-scanner.opt                       |    2 +-
 conf/plugins/imc-swid.conf                         |    3 -
 conf/plugins/imc-swid.opt                          |   11 +-
 conf/plugins/imc-test.conf                         |   15 -
 conf/plugins/imc-test.opt                          |   10 +-
 conf/plugins/imv-attestation.conf                  |   37 -
 conf/plugins/imv-attestation.opt                   |   22 +-
 conf/plugins/imv-os.conf                           |    3 -
 conf/plugins/imv-os.opt                            |    2 +-
 conf/plugins/imv-scanner.conf                      |    3 -
 conf/plugins/imv-scanner.opt                       |    2 +-
 conf/plugins/imv-swid.conf                         |    8 +
 conf/plugins/imv-swid.opt                          |    5 +
 conf/plugins/imv-test.conf                         |    3 -
 conf/plugins/imv-test.opt                          |    2 +-
 conf/plugins/kernel-klips.conf                     |   14 -
 conf/plugins/kernel-klips.opt                      |    5 -
 conf/plugins/load-tester.conf                      |    4 +
 conf/plugins/load-tester.opt                       |    4 +
 conf/plugins/vici.conf                             |   11 +
 conf/plugins/vici.opt                              |    2 +
 conf/strongswan.conf.5.main                        |  332 ++-
 config.h.in                                        |   16 +-
 configure                                          | 1221 ++++++---
 configure.ac                                       |  221 +-
 debian/changelog                                   |   17 +
 debian/control                                     |    2 +-
 .../patches/03_pfkey-Always-include-stdint.h.patch |   30 -
 debian/patches/series                              |    1 -
 debian/po/pt_BR.po                                 |   28 +-
 debian/strongswan-starter.install                  |    6 +-
 init/Makefile.in                                   |    6 +-
 init/systemd/Makefile.in                           |    6 +-
 man/Makefile.in                                    |    6 +-
 man/ipsec.conf.5.in                                |    9 +
 scripts/Makefile.am                                |    3 +-
 scripts/Makefile.in                                |   26 +-
 scripts/hash_burn.c                                |    3 +-
 scripts/settings-test.c                            |  126 +
 src/Makefile.am                                    |   20 +-
 src/Makefile.in                                    |   44 +-
 src/_copyright/Makefile.in                         |    6 +-
 src/_updown/Makefile.in                            |    6 +-
 src/_updown_espmark/Makefile.in                    |    6 +-
 src/aikgen/Makefile.am                             |   15 +
 src/aikgen/Makefile.in                             |  731 ++++++
 src/aikgen/aikgen.c                                |  554 ++++
 src/charon-cmd/Makefile.in                         |    6 +-
 src/charon-cmd/charon-cmd.c                        |    5 +-
 src/charon-cmd/cmd/cmd_connection.c                |    8 +-
 src/charon-cmd/cmd/cmd_creds.c                     |    4 +-
 src/charon-nm/Makefile.in                          |    6 +-
 src/charon-nm/nm/nm_service.c                      |    2 +
 src/charon-svc/Makefile.am                         |   16 +
 src/charon-svc/Makefile.in                         |  735 ++++++
 src/charon-svc/charon-svc.c                        |  333 +++
 src/charon-tkm/Makefile.in                         |    6 +-
 src/charon-tkm/src/tkm/tkm_kernel_ipsec.c          |    5 +-
 src/charon-tkm/src/tkm/tkm_listener.c              |    2 +-
 src/charon/Makefile.in                             |    6 +-
 src/charon/charon.c                                |   15 +-
 src/checksum/Makefile.am                           |   11 +-
 src/checksum/Makefile.in                           |   20 +-
 src/conftest/Makefile.am                           |    2 +-
 src/conftest/Makefile.in                           |    8 +-
 src/conftest/README                                |    2 +-
 src/conftest/config.c                              |    3 +
 src/conftest/hooks/add_notify.c                    |    5 +-
 src/conftest/hooks/add_payload.c                   |    3 +-
 src/conftest/hooks/custom_proposal.c               |    5 +-
 src/conftest/hooks/force_cookie.c                  |    2 +-
 src/conftest/hooks/ike_auth_fill.c                 |    2 +-
 src/conftest/hooks/log_id.c                        |    4 +-
 src/conftest/hooks/log_ke.c                        |    2 +-
 src/conftest/hooks/log_proposals.c                 |    2 +-
 src/conftest/hooks/log_ts.c                        |    4 +-
 src/conftest/hooks/pretend_auth.c                  |   18 +-
 src/conftest/hooks/rebuild_auth.c                  |    6 +-
 src/conftest/hooks/set_critical.c                  |    3 +-
 src/conftest/hooks/set_length.c                    |    3 +-
 src/conftest/hooks/set_proposal_number.c           |    2 +-
 src/conftest/hooks/set_reserved.c                  |   13 +-
 src/conftest/hooks/unencrypted_notify.c            |    5 +-
 src/conftest/hooks/unsort_message.c                |    3 +-
 src/dumm/Makefile.in                               |    6 +-
 src/dumm/ext/dumm.c                                |    2 +
 src/include/Makefile.in                            |    6 +-
 src/ipsec/Makefile.in                              |    6 +-
 src/ipsec/_ipsec.8                                 |    2 +-
 src/ipsec/_ipsec.in                                |    6 +-
 src/libcharon/Android.mk                           |    5 +-
 src/libcharon/Makefile.am                          |   37 +-
 src/libcharon/Makefile.in                          |  463 ++--
 src/libcharon/bus/bus.c                            |   92 +-
 src/libcharon/bus/bus.h                            |    8 +
 src/libcharon/bus/listeners/file_logger.c          |   14 +
 src/libcharon/bus/listeners/listener.h             |   18 +-
 src/libcharon/config/child_cfg.c                   |   31 +-
 src/libcharon/config/child_cfg.h                   |   20 +-
 src/libcharon/config/ike_cfg.c                     |    5 +-
 src/libcharon/config/ike_cfg.h                     |    5 +-
 src/libcharon/config/peer_cfg.c                    |    3 +-
 src/libcharon/config/proposal.c                    |  170 +-
 src/libcharon/config/proposal.h                    |    8 +
 src/libcharon/control/controller.c                 |    1 -
 src/libcharon/daemon.c                             |   80 +-
 src/libcharon/encoding/generator.c                 |   19 +-
 src/libcharon/encoding/message.c                   |  753 +++---
 src/libcharon/encoding/parser.c                    |   19 +-
 src/libcharon/encoding/payloads/auth_payload.c     |    4 +-
 src/libcharon/encoding/payloads/cert_payload.c     |    4 +-
 src/libcharon/encoding/payloads/certreq_payload.c  |   12 +-
 .../encoding/payloads/configuration_attribute.c    |    8 +-
 .../encoding/payloads/configuration_attribute.h    |    6 +-
 src/libcharon/encoding/payloads/cp_payload.c       |   10 +-
 src/libcharon/encoding/payloads/cp_payload.h       |    4 +-
 src/libcharon/encoding/payloads/delete_payload.c   |   12 +-
 src/libcharon/encoding/payloads/delete_payload.h   |    2 +-
 src/libcharon/encoding/payloads/eap_payload.c      |    4 +-
 .../encoding/payloads/encryption_payload.c         |   16 +-
 .../encoding/payloads/encryption_payload.h         |    2 +-
 src/libcharon/encoding/payloads/endpoint_notify.c  |    2 +-
 src/libcharon/encoding/payloads/fragment_payload.c |    4 +-
 src/libcharon/encoding/payloads/hash_payload.c     |    4 +-
 src/libcharon/encoding/payloads/hash_payload.h     |    2 +-
 src/libcharon/encoding/payloads/id_payload.c       |   12 +-
 src/libcharon/encoding/payloads/id_payload.h       |    6 +-
 src/libcharon/encoding/payloads/ike_header.c       |    2 +-
 src/libcharon/encoding/payloads/ke_payload.c       |    8 +-
 src/libcharon/encoding/payloads/ke_payload.h       |    4 +-
 src/libcharon/encoding/payloads/nonce_payload.c    |    8 +-
 src/libcharon/encoding/payloads/nonce_payload.h    |    2 +-
 src/libcharon/encoding/payloads/notify_payload.c   |   12 +-
 src/libcharon/encoding/payloads/notify_payload.h   |    4 +-
 src/libcharon/encoding/payloads/payload.c          |  154 +-
 src/libcharon/encoding/payloads/payload.h          |  118 +-
 .../encoding/payloads/proposal_substructure.c      |   82 +-
 .../encoding/payloads/proposal_substructure.h      |   10 +-
 src/libcharon/encoding/payloads/sa_payload.c       |   20 +-
 src/libcharon/encoding/payloads/sa_payload.h       |    2 +-
 .../payloads/traffic_selector_substructure.c       |    4 +-
 .../encoding/payloads/transform_attribute.c        |    4 +-
 .../encoding/payloads/transform_attribute.h        |    4 +-
 .../encoding/payloads/transform_substructure.c     |   20 +-
 .../encoding/payloads/transform_substructure.h     |    4 +-
 src/libcharon/encoding/payloads/ts_payload.c       |    8 +-
 src/libcharon/encoding/payloads/unknown_payload.c  |    2 +-
 .../encoding/payloads/vendor_id_payload.c          |    2 +-
 .../encoding/payloads/vendor_id_payload.h          |    4 +-
 src/libcharon/network/receiver.c                   |    2 +-
 src/libcharon/plugins/addrblock/Makefile.am        |    2 +-
 src/libcharon/plugins/addrblock/Makefile.in        |    8 +-
 src/libcharon/plugins/android_dns/Makefile.am      |    2 +-
 src/libcharon/plugins/android_dns/Makefile.in      |    8 +-
 src/libcharon/plugins/android_log/Makefile.am      |    2 +-
 src/libcharon/plugins/android_log/Makefile.in      |    8 +-
 src/libcharon/plugins/certexpire/Makefile.am       |    2 +-
 src/libcharon/plugins/certexpire/Makefile.in       |    8 +-
 src/libcharon/plugins/coupling/Makefile.am         |    2 +-
 src/libcharon/plugins/coupling/Makefile.in         |    8 +-
 .../plugins/coupling/coupling_validator.c          |   10 +-
 src/libcharon/plugins/dhcp/Makefile.am             |    2 +-
 src/libcharon/plugins/dhcp/Makefile.in             |    8 +-
 src/libcharon/plugins/dnscert/Makefile.am          |    2 +-
 src/libcharon/plugins/dnscert/Makefile.in          |    8 +-
 src/libcharon/plugins/duplicheck/Makefile.am       |    2 +-
 src/libcharon/plugins/duplicheck/Makefile.in       |    8 +-
 src/libcharon/plugins/eap_aka/Makefile.am          |    2 +-
 src/libcharon/plugins/eap_aka/Makefile.in          |    8 +-
 src/libcharon/plugins/eap_aka_3gpp2/Makefile.am    |    2 +-
 src/libcharon/plugins/eap_aka_3gpp2/Makefile.in    |    8 +-
 src/libcharon/plugins/eap_dynamic/Makefile.am      |    2 +-
 src/libcharon/plugins/eap_dynamic/Makefile.in      |    8 +-
 src/libcharon/plugins/eap_gtc/Makefile.am          |    2 +-
 src/libcharon/plugins/eap_gtc/Makefile.in          |    8 +-
 src/libcharon/plugins/eap_gtc/eap_gtc.c            |    6 +-
 src/libcharon/plugins/eap_identity/Makefile.am     |    2 +-
 src/libcharon/plugins/eap_identity/Makefile.in     |    8 +-
 src/libcharon/plugins/eap_md5/Makefile.am          |    2 +-
 src/libcharon/plugins/eap_md5/Makefile.in          |    8 +-
 src/libcharon/plugins/eap_mschapv2/Makefile.am     |    2 +-
 src/libcharon/plugins/eap_mschapv2/Makefile.in     |    8 +-
 src/libcharon/plugins/eap_peap/Makefile.am         |    2 +-
 src/libcharon/plugins/eap_peap/Makefile.in         |    8 +-
 src/libcharon/plugins/eap_peap/eap_peap_avp.c      |   15 -
 src/libcharon/plugins/eap_radius/Makefile.am       |    2 +-
 src/libcharon/plugins/eap_radius/Makefile.in       |    8 +-
 .../plugins/eap_radius/eap_radius_accounting.c     |    2 +-
 .../plugins/eap_radius/eap_radius_forward.c        |    7 +-
 .../plugins/eap_radius/eap_radius_xauth.c          |   10 +-
 src/libcharon/plugins/eap_sim/Makefile.am          |    2 +-
 src/libcharon/plugins/eap_sim/Makefile.in          |    8 +-
 src/libcharon/plugins/eap_sim_file/Makefile.am     |    2 +-
 src/libcharon/plugins/eap_sim_file/Makefile.in     |    8 +-
 src/libcharon/plugins/eap_sim_pcsc/Makefile.am     |    2 +-
 src/libcharon/plugins/eap_sim_pcsc/Makefile.in     |    8 +-
 .../plugins/eap_simaka_pseudonym/Makefile.am       |    2 +-
 .../plugins/eap_simaka_pseudonym/Makefile.in       |    8 +-
 .../plugins/eap_simaka_reauth/Makefile.am          |    2 +-
 .../plugins/eap_simaka_reauth/Makefile.in          |    8 +-
 src/libcharon/plugins/eap_simaka_sql/Makefile.am   |    2 +-
 src/libcharon/plugins/eap_simaka_sql/Makefile.in   |    8 +-
 src/libcharon/plugins/eap_tls/Makefile.am          |    2 +-
 src/libcharon/plugins/eap_tls/Makefile.in          |    8 +-
 src/libcharon/plugins/eap_tnc/Makefile.am          |    2 +-
 src/libcharon/plugins/eap_tnc/Makefile.in          |    8 +-
 src/libcharon/plugins/eap_tnc/eap_tnc.c            |   54 +-
 src/libcharon/plugins/eap_tnc/eap_tnc.h            |   28 +-
 src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c     |    8 +
 src/libcharon/plugins/eap_ttls/Makefile.am         |    2 +-
 src/libcharon/plugins/eap_ttls/Makefile.in         |    8 +-
 src/libcharon/plugins/eap_ttls/eap_ttls_server.c   |   30 +-
 src/libcharon/plugins/error_notify/Makefile.am     |    2 +-
 src/libcharon/plugins/error_notify/Makefile.in     |    8 +-
 src/libcharon/plugins/farp/Makefile.am             |    2 +-
 src/libcharon/plugins/farp/Makefile.in             |    8 +-
 src/libcharon/plugins/ha/Makefile.am               |    2 +-
 src/libcharon/plugins/ha/Makefile.in               |    8 +-
 src/libcharon/plugins/ha/ha_dispatcher.c           |   10 +-
 src/libcharon/plugins/ha/ha_tunnel.c               |    2 +
 src/libcharon/plugins/ipseckey/Makefile.am         |    2 +-
 src/libcharon/plugins/ipseckey/Makefile.in         |    8 +-
 src/libcharon/plugins/kernel_iph/Makefile.am       |   20 +
 src/libcharon/plugins/kernel_iph/Makefile.in       |  768 ++++++
 src/libcharon/plugins/kernel_iph/kernel_iph_net.c  |  775 ++++++
 src/libcharon/plugins/kernel_iph/kernel_iph_net.h  |   46 +
 .../plugins/kernel_iph/kernel_iph_plugin.c         |   76 +
 .../plugins/kernel_iph/kernel_iph_plugin.h         |   42 +
 src/libcharon/plugins/kernel_libipsec/Makefile.am  |    2 +-
 src/libcharon/plugins/kernel_libipsec/Makefile.in  |    8 +-
 .../kernel_libipsec/kernel_libipsec_ipsec.c        |    9 +-
 src/libcharon/plugins/kernel_wfp/Makefile.am       |   33 +
 src/libcharon/plugins/kernel_wfp/Makefile.in       |  801 ++++++
 src/libcharon/plugins/kernel_wfp/ipsecdump.c       |  666 +++++
 .../plugins/kernel_wfp/kernel_wfp_compat.c         |  157 ++
 .../plugins/kernel_wfp/kernel_wfp_compat.h         |  205 ++
 .../plugins/kernel_wfp/kernel_wfp_ipsec.c          | 2551 ++++++++++++++++++
 .../plugins/kernel_wfp/kernel_wfp_ipsec.h          |   47 +
 .../plugins/kernel_wfp/kernel_wfp_plugin.c         |   77 +
 .../plugins/kernel_wfp/kernel_wfp_plugin.h         |   43 +
 .../plugins/kernel_wfp/mingw-w64-4.8.1.diff        |   26 +
 src/libcharon/plugins/led/Makefile.am              |    2 +-
 src/libcharon/plugins/led/Makefile.in              |    8 +-
 src/libcharon/plugins/load_tester/Makefile.am      |    2 +-
 src/libcharon/plugins/load_tester/Makefile.in      |    8 +-
 .../plugins/load_tester/load_tester_config.c       |    4 +-
 .../plugins/load_tester/load_tester_creds.c        |   26 +-
 .../plugins/load_tester/load_tester_ipsec.c        |    9 +-
 src/libcharon/plugins/lookip/Makefile.am           |    2 +-
 src/libcharon/plugins/lookip/Makefile.in           |    8 +-
 src/libcharon/plugins/maemo/Makefile.am            |    2 +-
 src/libcharon/plugins/maemo/Makefile.in            |    8 +-
 src/libcharon/plugins/maemo/maemo_service.c        |    2 +
 src/libcharon/plugins/medcli/Makefile.am           |    2 +-
 src/libcharon/plugins/medcli/Makefile.in           |    8 +-
 src/libcharon/plugins/medcli/medcli_config.c       |    4 +
 src/libcharon/plugins/medsrv/Makefile.am           |    2 +-
 src/libcharon/plugins/medsrv/Makefile.in           |    8 +-
 src/libcharon/plugins/medsrv/medsrv_config.c       |    1 +
 src/libcharon/plugins/osx_attr/Makefile.am         |    2 +-
 src/libcharon/plugins/osx_attr/Makefile.in         |    8 +-
 src/libcharon/plugins/radattr/Makefile.am          |    2 +-
 src/libcharon/plugins/radattr/Makefile.in          |    8 +-
 src/libcharon/plugins/radattr/radattr_listener.c   |    4 +-
 src/libcharon/plugins/smp/Makefile.am              |    2 +-
 src/libcharon/plugins/smp/Makefile.in              |    8 +-
 src/libcharon/plugins/socket_default/Makefile.am   |    2 +-
 src/libcharon/plugins/socket_default/Makefile.in   |    8 +-
 src/libcharon/plugins/socket_dynamic/Makefile.am   |    2 +-
 src/libcharon/plugins/socket_dynamic/Makefile.in   |    8 +-
 src/libcharon/plugins/socket_win/Makefile.am       |   21 +
 src/libcharon/plugins/socket_win/Makefile.in       |  769 ++++++
 .../plugins/socket_win/socket_win_plugin.c         |   76 +
 .../plugins/socket_win/socket_win_plugin.h         |   42 +
 .../plugins/socket_win/socket_win_socket.c         |  501 ++++
 .../plugins/socket_win/socket_win_socket.h         |   44 +
 src/libcharon/plugins/sql/Makefile.am              |    2 +-
 src/libcharon/plugins/sql/Makefile.in              |    8 +-
 src/libcharon/plugins/sql/sql_config.c             |    2 +
 src/libcharon/plugins/stroke/Makefile.am           |    2 +-
 src/libcharon/plugins/stroke/Makefile.in           |    8 +-
 src/libcharon/plugins/stroke/stroke_config.c       |    6 +
 src/libcharon/plugins/stroke/stroke_socket.c       |   90 +-
 src/libcharon/plugins/systime_fix/Makefile.in      |    6 +-
 src/libcharon/plugins/tnc_ifmap/Makefile.am        |    2 +-
 src/libcharon/plugins/tnc_ifmap/Makefile.in        |    8 +-
 src/libcharon/plugins/tnc_pdp/Makefile.am          |    2 +-
 src/libcharon/plugins/tnc_pdp/Makefile.in          |    8 +-
 src/libcharon/plugins/tnc_pdp/tnc_pdp.c            |   91 +-
 src/libcharon/plugins/uci/Makefile.am              |    2 +-
 src/libcharon/plugins/uci/Makefile.in              |    8 +-
 src/libcharon/plugins/unit_tester/Makefile.am      |    2 +-
 src/libcharon/plugins/unit_tester/Makefile.in      |    8 +-
 src/libcharon/plugins/unity/Makefile.am            |    2 +-
 src/libcharon/plugins/unity/Makefile.in            |    8 +-
 src/libcharon/plugins/updown/Makefile.am           |    2 +-
 src/libcharon/plugins/updown/Makefile.in           |    8 +-
 src/libcharon/plugins/updown/updown_listener.c     |    4 +-
 src/libcharon/plugins/vici/Makefile.am             |   69 +
 src/libcharon/plugins/vici/Makefile.in             | 1183 +++++++++
 src/libcharon/plugins/vici/README.md               |  176 ++
 src/libcharon/plugins/vici/libvici.c               |  764 ++++++
 src/libcharon/plugins/vici/libvici.h               |  459 ++++
 src/libcharon/plugins/vici/suites/test_event.c     |  224 ++
 src/libcharon/plugins/vici/suites/test_message.c   |  407 +++
 src/libcharon/plugins/vici/suites/test_request.c   |  247 ++
 src/libcharon/plugins/vici/suites/test_socket.c    |  133 +
 src/libcharon/plugins/vici/vici_attribute.c        |  713 +++++
 src/libcharon/plugins/vici/vici_attribute.h        |   54 +
 src/libcharon/plugins/vici/vici_builder.c          |  253 ++
 src/libcharon/plugins/vici/vici_builder.h          |  129 +
 src/libcharon/plugins/vici/vici_config.c           | 2006 ++++++++++++++
 src/libcharon/plugins/vici/vici_config.h           |   53 +
 src/libcharon/plugins/vici/vici_control.c          |  496 ++++
 src/libcharon/plugins/vici/vici_control.h          |   47 +
 src/libcharon/plugins/vici/vici_cred.c             |  330 +++
 src/libcharon/plugins/vici/vici_cred.h             |   47 +
 src/libcharon/plugins/vici/vici_dispatcher.c       |  524 ++++
 src/libcharon/plugins/vici/vici_dispatcher.h       |  122 +
 src/libcharon/plugins/vici/vici_logger.c           |  130 +
 src/libcharon/plugins/vici/vici_logger.h           |   54 +
 src/libcharon/plugins/vici/vici_message.c          |  727 ++++++
 src/libcharon/plugins/vici/vici_message.h          |  248 ++
 src/libcharon/plugins/vici/vici_plugin.c           |  169 ++
 src/libcharon/plugins/vici/vici_plugin.h           |   42 +
 src/libcharon/plugins/vici/vici_query.c            | 1039 ++++++++
 src/libcharon/plugins/vici/vici_query.h            |   47 +
 src/libcharon/plugins/vici/vici_socket.c           |  679 +++++
 src/libcharon/plugins/vici/vici_socket.h           |   95 +
 src/libcharon/plugins/vici/vici_tests.c            |   46 +
 src/libcharon/plugins/vici/vici_tests.h            |   19 +
 src/libcharon/plugins/whitelist/Makefile.am        |    2 +-
 src/libcharon/plugins/whitelist/Makefile.in        |    8 +-
 src/libcharon/plugins/xauth_eap/Makefile.am        |    2 +-
 src/libcharon/plugins/xauth_eap/Makefile.in        |    8 +-
 src/libcharon/plugins/xauth_eap/xauth_eap.c        |    6 +-
 src/libcharon/plugins/xauth_generic/Makefile.am    |    2 +-
 src/libcharon/plugins/xauth_generic/Makefile.in    |    8 +-
 .../plugins/xauth_generic/xauth_generic.c          |   12 +-
 src/libcharon/plugins/xauth_noauth/Makefile.am     |    2 +-
 src/libcharon/plugins/xauth_noauth/Makefile.in     |    8 +-
 src/libcharon/plugins/xauth_pam/Makefile.am        |    2 +-
 src/libcharon/plugins/xauth_pam/Makefile.in        |    8 +-
 src/libcharon/plugins/xauth_pam/xauth_pam.c        |   13 +-
 .../plugins/xauth_pam/xauth_pam_listener.h         |    2 +-
 .../processing/jobs/process_message_job.c          |    2 +-
 src/libcharon/processing/jobs/rekey_ike_sa_job.c   |   49 +-
 src/libcharon/sa/authenticator.c                   |    2 +-
 src/libcharon/sa/child_sa.c                        |   31 +-
 src/libcharon/sa/ike_sa.c                          |   51 +-
 src/libcharon/sa/ike_sa.h                          |   26 +-
 src/libcharon/sa/ike_sa_manager.c                  |   19 +-
 .../sa/ikev1/authenticators/psk_v1_authenticator.c |    4 +-
 .../ikev1/authenticators/pubkey_v1_authenticator.c |    4 +-
 src/libcharon/sa/ikev1/keymat_v1.c                 |    6 +-
 src/libcharon/sa/ikev1/phase1.c                    |   10 +-
 src/libcharon/sa/ikev1/task_manager_v1.c           |    8 +-
 src/libcharon/sa/ikev1/tasks/aggressive_mode.c     |   16 +-
 src/libcharon/sa/ikev1/tasks/informational.c       |    4 +-
 src/libcharon/sa/ikev1/tasks/isakmp_cert_post.c    |    6 +-
 src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.c     |    8 +-
 src/libcharon/sa/ikev1/tasks/isakmp_delete.c       |    2 +-
 src/libcharon/sa/ikev1/tasks/isakmp_dpd.c          |    2 +-
 src/libcharon/sa/ikev1/tasks/isakmp_natd.c         |   16 +-
 src/libcharon/sa/ikev1/tasks/isakmp_vendor.c       |    6 +-
 src/libcharon/sa/ikev1/tasks/main_mode.c           |   16 +-
 src/libcharon/sa/ikev1/tasks/mode_config.c         |   33 +-
 src/libcharon/sa/ikev1/tasks/quick_delete.c        |    4 +-
 src/libcharon/sa/ikev1/tasks/quick_mode.c          |   24 +-
 src/libcharon/sa/ikev1/tasks/xauth.c               |   20 +-
 .../sa/ikev2/authenticators/eap_authenticator.c    |    6 +-
 .../sa/ikev2/authenticators/psk_authenticator.c    |    2 +-
 .../sa/ikev2/authenticators/pubkey_authenticator.c |    2 +-
 src/libcharon/sa/ikev2/connect_manager.c           |    2 +-
 src/libcharon/sa/ikev2/task_manager_v2.c           |   10 +-
 src/libcharon/sa/ikev2/tasks/child_create.c        |   30 +-
 src/libcharon/sa/ikev2/tasks/child_delete.c        |    6 +-
 src/libcharon/sa/ikev2/tasks/child_rekey.c         |    6 +-
 src/libcharon/sa/ikev2/tasks/ike_auth.c            |   28 +-
 src/libcharon/sa/ikev2/tasks/ike_cert_post.c       |   14 +-
 src/libcharon/sa/ikev2/tasks/ike_cert_pre.c        |    8 +-
 src/libcharon/sa/ikev2/tasks/ike_config.c          |   25 +-
 src/libcharon/sa/ikev2/tasks/ike_delete.c          |    2 +-
 src/libcharon/sa/ikev2/tasks/ike_init.c            |   12 +-
 src/libcharon/sa/ikev2/tasks/ike_me.c              |   10 +-
 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           |   14 +-
 src/libcharon/sa/ikev2/tasks/ike_vendor.c          |    4 +-
 src/libcharon/sa/shunt_manager.c                   |   43 +-
 src/libfast/Makefile.am                            |    2 +-
 src/libfast/Makefile.in                            |    8 +-
 src/libhydra/Makefile.am                           |   11 +-
 src/libhydra/Makefile.in                           |   63 +-
 src/libhydra/attributes/attributes.h               |    2 +-
 src/libhydra/kernel/kernel_interface.c             |   14 +-
 src/libhydra/kernel/kernel_interface.h             |    9 +-
 src/libhydra/kernel/kernel_ipsec.h                 |    2 +
 src/libhydra/kernel/kernel_net.h                   |    4 +-
 src/libhydra/plugins/attr/Makefile.am              |    2 +-
 src/libhydra/plugins/attr/Makefile.in              |    8 +-
 src/libhydra/plugins/attr_sql/Makefile.am          |    2 +-
 src/libhydra/plugins/attr_sql/Makefile.in          |    8 +-
 src/libhydra/plugins/kernel_klips/Makefile.am      |   18 -
 src/libhydra/plugins/kernel_klips/Makefile.in      |  762 ------
 .../plugins/kernel_klips/kernel_klips_ipsec.c      | 2652 -------------------
 .../plugins/kernel_klips/kernel_klips_ipsec.h      |   46 -
 .../plugins/kernel_klips/kernel_klips_plugin.c     |   76 -
 .../plugins/kernel_klips/kernel_klips_plugin.h     |   42 -
 src/libhydra/plugins/kernel_klips/pfkeyv2.h        |  322 ---
 src/libhydra/plugins/kernel_netlink/Makefile.am    |    2 +-
 src/libhydra/plugins/kernel_netlink/Makefile.in    |    8 +-
 .../plugins/kernel_netlink/kernel_netlink_ipsec.c  |   88 +-
 .../plugins/kernel_netlink/kernel_netlink_net.c    |  264 +-
 src/libhydra/plugins/kernel_pfkey/Makefile.am      |    2 +-
 src/libhydra/plugins/kernel_pfkey/Makefile.in      |    8 +-
 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.c      |  206 +-
 src/libhydra/plugins/kernel_pfroute/Makefile.am    |    2 +-
 src/libhydra/plugins/kernel_pfroute/Makefile.in    |    8 +-
 .../plugins/kernel_pfroute/kernel_pfroute_net.c    |    2 +-
 src/libhydra/plugins/resolve/Makefile.am           |    2 +-
 src/libhydra/plugins/resolve/Makefile.in           |    8 +-
 src/libimcv/Android.mk                             |   66 +
 src/libimcv/Makefile.am                            |   11 +-
 src/libimcv/Makefile.in                            |   52 +-
 src/libimcv/ietf/ietf_attr_installed_packages.c    |   10 +-
 src/libimcv/ietf/ietf_attr_installed_packages.h    |    3 +-
 src/libimcv/imc/imc_agent.c                        |    3 +-
 src/libimcv/imc/imc_msg.c                          |   18 +-
 src/libimcv/imc/imc_os_info.c                      |  632 +++++
 src/libimcv/imc/imc_os_info.h                      |  107 +
 src/libimcv/imcv.c                                 |   51 +-
 src/libimcv/imcv.h                                 |    6 +
 src/libimcv/imv/_imv_policy                        |   14 +-
 src/libimcv/imv/data.sql                           |  345 ++-
 src/libimcv/imv/imv_agent.c                        |   48 +-
 src/libimcv/imv/imv_agent.h                        |    4 +-
 src/libimcv/imv/imv_database.c                     |  302 +--
 src/libimcv/imv/imv_database.h                     |   20 -
 src/libimcv/imv/imv_if.h                           |   55 +-
 src/libimcv/imv/imv_os_info.c                      |  168 ++
 src/libimcv/imv/imv_os_info.h                      |   88 +
 src/libimcv/imv/imv_policy_manager.c               |   13 +-
 src/libimcv/imv/imv_policy_manager_usage.c         |    3 +-
 src/libimcv/imv/imv_session.c                      |  147 +-
 src/libimcv/imv/imv_session.h                      |   80 +-
 src/libimcv/imv/imv_session_manager.c              |  131 +
 src/libimcv/imv/imv_session_manager.h              |   69 +
 src/libimcv/imv/imv_state.h                        |   27 +-
 src/libimcv/imv/tables-mysql.sql                   |  200 ++
 src/libimcv/imv/tables.sql                         |  151 +-
 src/libimcv/os_info/os_info.c                      |  553 +---
 src/libimcv/os_info/os_info.h                      |   82 +-
 src/libimcv/pa_tnc/pa_tnc_attr.h                   |    6 +-
 src/libimcv/pa_tnc/pa_tnc_msg.c                    |   21 +-
 src/libimcv/pa_tnc/pa_tnc_msg.h                    |    3 +-
 src/libimcv/plugins/imc_os/Makefile.am             |    2 +-
 src/libimcv/plugins/imc_os/Makefile.in             |    8 +-
 src/libimcv/plugins/imc_os/imc_os.c                |  165 +-
 src/libimcv/plugins/imc_scanner/Makefile.am        |    2 +-
 src/libimcv/plugins/imc_scanner/Makefile.in        |    8 +-
 src/libimcv/plugins/imc_test/Makefile.am           |    2 +-
 src/libimcv/plugins/imc_test/Makefile.in           |    8 +-
 src/libimcv/plugins/imv_os/Makefile.am             |    4 +-
 src/libimcv/plugins/imv_os/Makefile.in             |   26 +-
 src/libimcv/plugins/imv_os/imv_os_agent.c          |  164 +-
 src/libimcv/plugins/imv_os/imv_os_database.c       |   67 +-
 src/libimcv/plugins/imv_os/imv_os_database.h       |   14 +-
 src/libimcv/plugins/imv_os/imv_os_state.c          |  136 +-
 src/libimcv/plugins/imv_os/imv_os_state.h          |   37 +-
 src/libimcv/plugins/imv_os/pacman.sh               |   23 +-
 src/libimcv/plugins/imv_scanner/Makefile.am        |    2 +-
 src/libimcv/plugins/imv_scanner/Makefile.in        |    8 +-
 .../plugins/imv_scanner/imv_scanner_agent.c        |    5 +-
 .../plugins/imv_scanner/imv_scanner_state.c        |   44 +-
 src/libimcv/plugins/imv_test/Makefile.am           |    2 +-
 src/libimcv/plugins/imv_test/Makefile.in           |    8 +-
 src/libimcv/plugins/imv_test/imv_test_state.c      |   36 +-
 src/libipsec/Makefile.in                           |    6 +-
 src/libipsec/esp_packet.c                          |    4 +-
 src/libipsec/ip_packet.c                           |    4 +-
 src/libipsec/ipsec_policy_mgr.c                    |    5 +-
 src/libpts/Android.mk                              |   78 +
 src/libpts/Makefile.am                             |    8 +
 src/libpts/Makefile.in                             |   39 +-
 src/libpts/plugins/imc_attestation/Makefile.am     |    2 +-
 src/libpts/plugins/imc_attestation/Makefile.in     |    8 +-
 .../plugins/imc_attestation/imc_attestation.c      |   54 +-
 src/libpts/plugins/imc_swid/Makefile.am            |    2 +-
 src/libpts/plugins/imc_swid/Makefile.in            |    8 +-
 src/libpts/plugins/imc_swid/imc_swid.c             |  208 +-
 ...id.2004-03.org.strongswan_strongSwan.swidtag.in |   40 +-
 src/libpts/plugins/imv_attestation/Makefile.am     |    2 +-
 src/libpts/plugins/imv_attestation/Makefile.in     |    8 +-
 src/libpts/plugins/imv_attestation/attest.c        |   57 +-
 src/libpts/plugins/imv_attestation/attest_db.c     |  207 +-
 src/libpts/plugins/imv_attestation/attest_db.h     |   10 +-
 .../plugins/imv_attestation/build-database.sh      |  293 +--
 .../imv_attestation/imv_attestation_agent.c        |  230 +-
 .../imv_attestation/imv_attestation_build.c        |   14 +-
 .../imv_attestation/imv_attestation_process.c      |   93 +-
 .../imv_attestation/imv_attestation_state.c        |   68 +-
 .../imv_attestation/imv_attestation_state.h        |   26 +-
 src/libpts/plugins/imv_swid/Makefile.am            |    8 +-
 src/libpts/plugins/imv_swid/Makefile.in            |   17 +-
 src/libpts/plugins/imv_swid/imv_swid_agent.c       |  359 ++-
 src/libpts/plugins/imv_swid/imv_swid_rest.c        |  122 +
 src/libpts/plugins/imv_swid/imv_swid_rest.h        |   63 +
 src/libpts/plugins/imv_swid/imv_swid_state.c       |  172 +-
 src/libpts/plugins/imv_swid/imv_swid_state.h       |   63 +-
 src/libpts/pts/components/ita/ita_comp_ima.c       |  694 +++--
 src/libpts/pts/components/ita/ita_comp_tboot.c     |   95 +-
 src/libpts/pts/components/ita/ita_comp_tgrub.c     |    7 +-
 src/libpts/pts/components/pts_component.h          |    5 +-
 src/libpts/pts/pts.c                               |  152 +-
 src/libpts/pts/pts.h                               |   22 +-
 src/libpts/pts/pts_database.c                      |  172 +-
 src/libpts/pts/pts_database.h                      |   62 +-
 src/libpts/pts/pts_file_meas.c                     |  117 +-
 src/libpts/pts/pts_file_meas.h                     |    5 +-
 src/libpts/pts/pts_ima_bios_list.c                 |  294 +++
 src/libpts/pts/pts_ima_bios_list.h                 |   74 +
 src/libpts/pts/pts_ima_event_list.c                |  330 +++
 src/libpts/pts/pts_ima_event_list.h                |   80 +
 src/libpts/pts/pts_meas_algo.c                     |    7 +-
 src/libpts/pts/pts_meas_algo.h                     |    4 +-
 src/libpts/swid/swid_error.c                       |    2 +-
 src/libpts/swid/swid_inventory.c                   |  238 +-
 src/libpts/swid/swid_inventory.h                   |    9 +-
 src/libpts/swid/swid_tag.c                         |   40 +-
 src/libpts/swid/swid_tag.h                         |   19 +-
 src/libpts/swid/swid_tag_id.c                      |   42 +-
 src/libpts/swid/swid_tag_id.h                      |   19 +-
 src/libpts/tcg/swid/tcg_swid_attr_req.c            |    7 +-
 src/libpts/tcg/swid/tcg_swid_attr_req.h            |    4 +-
 src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.c     |   66 +-
 src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.h     |   25 +-
 src/libpts/tcg/swid/tcg_swid_attr_tag_inv.c        |   60 +-
 src/libpts/tcg/swid/tcg_swid_attr_tag_inv.h        |   24 +-
 src/libpttls/Makefile.am                           |    4 +
 src/libpttls/Makefile.in                           |   15 +-
 src/libpttls/pt_tls.h                              |    2 +-
 src/libradius/Makefile.in                          |    6 +-
 src/libsimaka/Makefile.in                          |    6 +-
 src/libsimaka/simaka_message.h                     |    2 +-
 src/libstrongswan/Android.mk                       |   30 +-
 src/libstrongswan/AndroidConfigLocal.h             |    2 -
 src/libstrongswan/Makefile.am                      |   70 +-
 src/libstrongswan/Makefile.in                      |  686 +++--
 src/libstrongswan/asn1/asn1.c                      |    2 +-
 src/libstrongswan/asn1/oid.h                       |    2 +-
 src/libstrongswan/asn1/oid.pl                      |    2 +-
 src/libstrongswan/collections/array.c              |    2 +-
 src/libstrongswan/collections/dictionary.h         |   55 +
 src/libstrongswan/collections/enumerator.c         |  103 +-
 src/libstrongswan/collections/enumerator.h         |   37 +-
 src/libstrongswan/collections/hashtable.c          |   39 +-
 src/libstrongswan/collections/hashtable.h          |    9 +
 src/libstrongswan/credentials/auth_cfg.c           |    2 +-
 src/libstrongswan/credentials/certificates/crl.h   |   28 +-
 src/libstrongswan/credentials/cred_encoding.h      |    2 +
 src/libstrongswan/credentials/sets/cert_cache.c    |    1 -
 src/libstrongswan/credentials/sets/mem_cred.c      |   76 +-
 src/libstrongswan/crypto/crypto_factory.c          |   18 +-
 src/libstrongswan/crypto/crypto_tester.c           |    8 +-
 src/libstrongswan/crypto/transform.h               |    2 +-
 src/libstrongswan/eap/eap.c                        |   11 +-
 src/libstrongswan/eap/eap.h                        |    1 +
 src/libstrongswan/fetcher/fetcher.h                |    6 +
 src/libstrongswan/fetcher/fetcher_manager.c        |    4 +
 src/libstrongswan/ipsec/ipsec_types.h              |    6 +-
 src/libstrongswan/library.c                        |   16 +-
 src/libstrongswan/library.h                        |    2 +-
 src/libstrongswan/networking/host.h                |    4 +-
 src/libstrongswan/networking/host_resolver.c       |    2 -
 src/libstrongswan/networking/streams/stream.c      |  133 +-
 src/libstrongswan/networking/streams/stream.h      |   51 -
 .../networking/streams/stream_manager.c            |   19 +-
 .../networking/streams/stream_service.c            |   99 +-
 .../networking/streams/stream_service.h            |   19 -
 .../networking/streams/stream_service_tcp.c        |   64 +
 .../networking/streams/stream_service_tcp.h        |   33 +
 .../networking/streams/stream_service_unix.c       |   75 +
 .../networking/streams/stream_service_unix.h       |   42 +
 src/libstrongswan/networking/streams/stream_tcp.c  |   99 +
 src/libstrongswan/networking/streams/stream_tcp.h  |   52 +
 src/libstrongswan/networking/streams/stream_unix.c |   69 +
 src/libstrongswan/networking/streams/stream_unix.h |   48 +
 src/libstrongswan/networking/tun_device.c          |  124 +-
 src/libstrongswan/plugins/acert/Makefile.am        |    2 +-
 src/libstrongswan/plugins/acert/Makefile.in        |    8 +-
 src/libstrongswan/plugins/aes/Makefile.am          |    2 +-
 src/libstrongswan/plugins/aes/Makefile.in          |    8 +-
 src/libstrongswan/plugins/aes/aes_crypter.c        |  687 +----
 src/libstrongswan/plugins/af_alg/Makefile.am       |    2 +-
 src/libstrongswan/plugins/af_alg/Makefile.in       |    8 +-
 src/libstrongswan/plugins/agent/Makefile.am        |    2 +-
 src/libstrongswan/plugins/agent/Makefile.in        |    8 +-
 src/libstrongswan/plugins/blowfish/Makefile.am     |    2 +-
 src/libstrongswan/plugins/blowfish/Makefile.in     |    8 +-
 src/libstrongswan/plugins/ccm/Makefile.am          |    2 +-
 src/libstrongswan/plugins/ccm/Makefile.in          |    8 +-
 src/libstrongswan/plugins/cmac/Makefile.am         |    2 +-
 src/libstrongswan/plugins/cmac/Makefile.in         |    8 +-
 src/libstrongswan/plugins/constraints/Makefile.am  |    2 +-
 src/libstrongswan/plugins/constraints/Makefile.in  |    8 +-
 src/libstrongswan/plugins/ctr/Makefile.am          |    2 +-
 src/libstrongswan/plugins/ctr/Makefile.in          |    8 +-
 src/libstrongswan/plugins/curl/Makefile.am         |    2 +-
 src/libstrongswan/plugins/curl/Makefile.in         |    8 +-
 src/libstrongswan/plugins/curl/curl_fetcher.c      |   21 +-
 src/libstrongswan/plugins/des/Makefile.am          |    2 +-
 src/libstrongswan/plugins/des/Makefile.in          |    8 +-
 src/libstrongswan/plugins/dnskey/Makefile.am       |    2 +-
 src/libstrongswan/plugins/dnskey/Makefile.in       |    8 +-
 src/libstrongswan/plugins/fips_prf/Makefile.am     |    2 +-
 src/libstrongswan/plugins/fips_prf/Makefile.in     |    8 +-
 src/libstrongswan/plugins/gcm/Makefile.am          |    2 +-
 src/libstrongswan/plugins/gcm/Makefile.in          |    8 +-
 src/libstrongswan/plugins/gcrypt/Makefile.am       |    2 +-
 src/libstrongswan/plugins/gcrypt/Makefile.in       |    8 +-
 src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c   |   54 +-
 src/libstrongswan/plugins/gmp/Makefile.am          |    2 +-
 src/libstrongswan/plugins/gmp/Makefile.in          |    8 +-
 src/libstrongswan/plugins/hmac/Makefile.am         |    2 +-
 src/libstrongswan/plugins/hmac/Makefile.in         |    8 +-
 src/libstrongswan/plugins/keychain/Makefile.am     |    2 +-
 src/libstrongswan/plugins/keychain/Makefile.in     |    8 +-
 src/libstrongswan/plugins/ldap/Makefile.am         |    2 +-
 src/libstrongswan/plugins/ldap/Makefile.in         |    8 +-
 src/libstrongswan/plugins/md4/Makefile.am          |    2 +-
 src/libstrongswan/plugins/md4/Makefile.in          |    8 +-
 src/libstrongswan/plugins/md5/Makefile.am          |    2 +-
 src/libstrongswan/plugins/md5/Makefile.in          |    8 +-
 src/libstrongswan/plugins/mysql/Makefile.am        |    2 +-
 src/libstrongswan/plugins/mysql/Makefile.in        |    8 +-
 src/libstrongswan/plugins/mysql/mysql_database.c   |   12 +-
 src/libstrongswan/plugins/mysql/mysql_database.h   |    1 +
 src/libstrongswan/plugins/nonce/Makefile.am        |    2 +-
 src/libstrongswan/plugins/nonce/Makefile.in        |    8 +-
 src/libstrongswan/plugins/ntru/Makefile.am         |    5 +-
 src/libstrongswan/plugins/ntru/Makefile.in         |    9 +-
 src/libstrongswan/plugins/openssl/Makefile.am      |    4 +-
 src/libstrongswan/plugins/openssl/Makefile.in      |   13 +-
 src/libstrongswan/plugins/openssl/openssl_plugin.c |   21 +-
 src/libstrongswan/plugins/openssl/openssl_rng.c    |    2 +
 src/libstrongswan/plugins/openssl/openssl_util.h   |    6 +
 src/libstrongswan/plugins/padlock/Makefile.am      |    2 +-
 src/libstrongswan/plugins/padlock/Makefile.in      |    8 +-
 src/libstrongswan/plugins/pem/Makefile.am          |    2 +-
 src/libstrongswan/plugins/pem/Makefile.in          |    8 +-
 src/libstrongswan/plugins/pgp/Makefile.am          |    2 +-
 src/libstrongswan/plugins/pgp/Makefile.in          |    8 +-
 src/libstrongswan/plugins/pgp/pgp_builder.c        |    3 +-
 src/libstrongswan/plugins/pkcs1/Makefile.am        |    2 +-
 src/libstrongswan/plugins/pkcs1/Makefile.in        |    8 +-
 src/libstrongswan/plugins/pkcs1/pkcs1_encoder.c    |   47 +-
 src/libstrongswan/plugins/pkcs11/Makefile.am       |    2 +-
 src/libstrongswan/plugins/pkcs11/Makefile.in       |    8 +-
 src/libstrongswan/plugins/pkcs11/pkcs11_library.h  |    2 +-
 src/libstrongswan/plugins/pkcs12/Makefile.am       |    2 +-
 src/libstrongswan/plugins/pkcs12/Makefile.in       |    8 +-
 src/libstrongswan/plugins/pkcs7/Makefile.am        |    2 +-
 src/libstrongswan/plugins/pkcs7/Makefile.in        |    8 +-
 src/libstrongswan/plugins/pkcs8/Makefile.am        |    2 +-
 src/libstrongswan/plugins/pkcs8/Makefile.in        |    8 +-
 src/libstrongswan/plugins/plugin_loader.c          |    2 +
 src/libstrongswan/plugins/pubkey/Makefile.am       |    2 +-
 src/libstrongswan/plugins/pubkey/Makefile.in       |    8 +-
 src/libstrongswan/plugins/random/Makefile.am       |    2 +-
 src/libstrongswan/plugins/random/Makefile.in       |    8 +-
 src/libstrongswan/plugins/random/random_plugin.c   |    5 +
 src/libstrongswan/plugins/rc2/Makefile.am          |    2 +-
 src/libstrongswan/plugins/rc2/Makefile.in          |    8 +-
 src/libstrongswan/plugins/rdrand/Makefile.am       |    2 +-
 src/libstrongswan/plugins/rdrand/Makefile.in       |    8 +-
 src/libstrongswan/plugins/revocation/Makefile.am   |    2 +-
 src/libstrongswan/plugins/revocation/Makefile.in   |    8 +-
 src/libstrongswan/plugins/sha1/Makefile.am         |    2 +-
 src/libstrongswan/plugins/sha1/Makefile.in         |    8 +-
 src/libstrongswan/plugins/sha1/sha1_hasher.c       |    4 +-
 src/libstrongswan/plugins/sha1/sha1_prf.c          |    3 +-
 src/libstrongswan/plugins/sha2/Makefile.am         |    2 +-
 src/libstrongswan/plugins/sha2/Makefile.in         |    8 +-
 src/libstrongswan/plugins/soup/Makefile.am         |    2 +-
 src/libstrongswan/plugins/soup/Makefile.in         |    8 +-
 src/libstrongswan/plugins/soup/soup_fetcher.c      |   16 +-
 src/libstrongswan/plugins/sqlite/Makefile.am       |    2 +-
 src/libstrongswan/plugins/sqlite/Makefile.in       |    8 +-
 src/libstrongswan/plugins/sqlite/sqlite_database.c |   10 +-
 src/libstrongswan/plugins/sshkey/Makefile.am       |    2 +-
 src/libstrongswan/plugins/sshkey/Makefile.in       |    8 +-
 src/libstrongswan/plugins/sshkey/sshkey_builder.c  |   49 +-
 src/libstrongswan/plugins/sshkey/sshkey_builder.h  |   15 +-
 src/libstrongswan/plugins/sshkey/sshkey_plugin.c   |    4 +-
 src/libstrongswan/plugins/test_vectors/Makefile.am |    2 +-
 src/libstrongswan/plugins/test_vectors/Makefile.in |    8 +-
 src/libstrongswan/plugins/unbound/Makefile.am      |    2 +-
 src/libstrongswan/plugins/unbound/Makefile.in      |    8 +-
 src/libstrongswan/plugins/unbound/unbound_rr.c     |    4 +-
 src/libstrongswan/plugins/winhttp/Makefile.am      |   18 +
 src/libstrongswan/plugins/winhttp/Makefile.in      |  766 ++++++
 .../plugins/winhttp/winhttp_fetcher.c              |  396 +++
 .../plugins/winhttp/winhttp_fetcher.h              |   46 +
 src/libstrongswan/plugins/winhttp/winhttp_plugin.c |   74 +
 src/libstrongswan/plugins/winhttp/winhttp_plugin.h |   42 +
 src/libstrongswan/plugins/x509/Makefile.am         |    2 +-
 src/libstrongswan/plugins/x509/Makefile.in         |    8 +-
 src/libstrongswan/plugins/x509/x509_ac.c           |   25 +-
 src/libstrongswan/plugins/x509/x509_cert.c         |    5 -
 .../plugins/x509/x509_ocsp_response.c              |   25 +-
 src/libstrongswan/plugins/xcbc/Makefile.am         |    2 +-
 src/libstrongswan/plugins/xcbc/Makefile.in         |    8 +-
 src/libstrongswan/processing/processor.c           |   12 +-
 src/libstrongswan/processing/watcher.c             |  118 +-
 src/libstrongswan/selectors/traffic_selector.c     |    7 +-
 src/libstrongswan/settings/settings.c              |  944 +++++++
 src/libstrongswan/settings/settings.h              |  353 +++
 src/libstrongswan/settings/settings_lexer.c        | 2686 +++++++++++++++++++
 src/libstrongswan/settings/settings_lexer.l        |  201 ++
 src/libstrongswan/settings/settings_parser.c       | 1747 +++++++++++++
 src/libstrongswan/settings/settings_parser.h       |   79 +
 src/libstrongswan/settings/settings_parser.y       |  290 +++
 src/libstrongswan/settings/settings_types.c        |  321 +++
 src/libstrongswan/settings/settings_types.h        |  177 ++
 src/libstrongswan/tests/Makefile.am                |    3 +-
 src/libstrongswan/tests/Makefile.in                |   27 +-
 src/libstrongswan/tests/suites/test_asn1.c         |    4 +-
 src/libstrongswan/tests/suites/test_chunk.c        |   12 +-
 .../tests/suites/test_crypto_factory.c             |  312 +++
 src/libstrongswan/tests/suites/test_enum.c         |   52 +-
 src/libstrongswan/tests/suites/test_fetch_http.c   |   84 +-
 src/libstrongswan/tests/suites/test_host.c         |    4 +-
 .../tests/suites/test_identification.c             |    8 +-
 src/libstrongswan/tests/suites/test_settings.c     |  435 +++-
 src/libstrongswan/tests/suites/test_stream.c       |    3 +-
 src/libstrongswan/tests/suites/test_threading.c    |    6 +-
 src/libstrongswan/tests/suites/test_utils.c        |   82 +-
 src/libstrongswan/tests/suites/test_watcher.c      |    9 +-
 src/libstrongswan/tests/test_runner.c              |   67 +-
 src/libstrongswan/tests/test_runner.h              |    8 +-
 src/libstrongswan/tests/test_suite.c               |  232 +-
 src/libstrongswan/tests/test_suite.h               |   46 +-
 src/libstrongswan/tests/tests.c                    |   10 +-
 src/libstrongswan/tests/tests.h                    |    1 +
 src/libstrongswan/threading/thread.c               |    3 +
 src/libstrongswan/threading/windows/mutex.c        |  196 ++
 src/libstrongswan/threading/windows/rwlock.c       |  220 ++
 src/libstrongswan/threading/windows/semaphore.c    |  101 +
 src/libstrongswan/threading/windows/spinlock.c     |   79 +
 src/libstrongswan/threading/windows/thread.c       |  677 +++++
 src/libstrongswan/threading/windows/thread.h       |   74 +
 src/libstrongswan/threading/windows/thread_value.c |  178 ++
 src/libstrongswan/utils/backtrace.c                |  253 +-
 src/libstrongswan/utils/capabilities.c             |   40 +-
 src/libstrongswan/utils/chunk.c                    |   50 +-
 src/libstrongswan/utils/chunk.h                    |   11 +
 src/libstrongswan/utils/debug.h                    |    2 +-
 src/libstrongswan/utils/enum.c                     |    8 +-
 src/libstrongswan/utils/enum.h                     |   25 +-
 src/libstrongswan/utils/identification.c           |   21 +-
 src/libstrongswan/utils/leak_detective.c           |    8 +-
 src/libstrongswan/utils/optionsfrom.c              |    9 +-
 src/libstrongswan/utils/parser_helper.c            |  261 ++
 src/libstrongswan/utils/parser_helper.h            |  161 ++
 .../utils/printf_hook/printf_hook_builtin.c        |  124 +
 src/libstrongswan/utils/settings.c                 | 1520 -----------
 src/libstrongswan/utils/settings.h                 |  348 ---
 src/libstrongswan/utils/test.c                     |   71 +-
 src/libstrongswan/utils/test.h                     |   18 +-
 src/libstrongswan/utils/utils.c                    |  279 +-
 src/libstrongswan/utils/utils.h                    |  173 +-
 src/libstrongswan/utils/utils/strerror.c           |  122 +-
 src/libstrongswan/utils/utils/strerror.h           |   10 +
 src/libstrongswan/utils/windows.c                  |  641 +++++
 src/libstrongswan/utils/windows.h                  |  584 +++++
 src/libtls/Makefile.am                             |    4 +
 src/libtls/Makefile.in                             |   16 +-
 src/libtls/tests/Makefile.am                       |    2 +-
 src/libtls/tests/Makefile.in                       |    8 +-
 src/libtls/tls.c                                   |    8 +-
 src/libtls/tls_crypto.c                            |    4 +-
 src/libtls/tls_eap.c                               |  113 +-
 src/libtls/tls_eap.h                               |    4 +-
 src/libtnccs/Makefile.am                           |    6 +-
 src/libtnccs/Makefile.in                           |   56 +-
 src/libtnccs/plugins/tnc_imc/Makefile.am           |    2 +-
 src/libtnccs/plugins/tnc_imc/Makefile.in           |    8 +-
 src/libtnccs/plugins/tnc_imc/tnc_imc.c             |    6 +-
 src/libtnccs/plugins/tnc_imv/Makefile.am           |    2 +-
 src/libtnccs/plugins/tnc_imv/Makefile.in           |    8 +-
 src/libtnccs/plugins/tnc_imv/tnc_imv.c             |    2 +
 src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c     |   13 +-
 src/libtnccs/plugins/tnc_tnccs/Makefile.am         |    2 +-
 src/libtnccs/plugins/tnc_tnccs/Makefile.in         |    8 +-
 src/libtnccs/plugins/tnccs_11/Makefile.am          |    2 +-
 src/libtnccs/plugins/tnccs_11/Makefile.in          |    8 +-
 .../plugins/tnccs_11/messages/tnccs_error_msg.c    |    5 +-
 src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.c |    6 +-
 src/libtnccs/plugins/tnccs_20/Makefile.am          |    2 +-
 src/libtnccs/plugins/tnccs_20/Makefile.in          |    8 +-
 src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c |   13 +-
 src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.h |    3 +
 .../plugins/tnccs_20/messages/ietf/pb_pa_msg.c     |    2 +-
 .../plugins/tnccs_20/messages/ietf/pb_pa_msg.h     |    2 +
 src/libtnccs/plugins/tnccs_20/tnccs_20.c           |   38 +-
 src/libtnccs/plugins/tnccs_dynamic/Makefile.am     |    2 +-
 src/libtnccs/plugins/tnccs_dynamic/Makefile.in     |    8 +-
 src/libtnccs/tnc/tnc.c                             |    8 +-
 src/libtncif/Makefile.in                           |    6 +-
 src/manager/Makefile.am                            |    2 +-
 src/manager/Makefile.in                            |    8 +-
 src/medsrv/Makefile.am                             |    2 +-
 src/medsrv/Makefile.in                             |    8 +-
 src/pki/Makefile.in                                |    6 +-
 src/pki/command.c                                  |    2 +-
 src/pki/commands/acert.c                           |    5 +-
 src/pki/commands/gen.c                             |    2 +-
 src/pki/commands/issue.c                           |    5 +-
 src/pki/commands/keyid.c                           |    1 +
 src/pki/commands/pkcs7.c                           |    1 +
 src/pki/commands/print.c                           |    1 +
 src/pki/commands/pub.c                             |    2 +
 src/pki/commands/req.c                             |    5 +-
 src/pki/commands/self.c                            |    5 +-
 src/pki/commands/signcrl.c                         |    4 +-
 src/pki/commands/verify.c                          |  135 +-
 src/pki/man/Makefile.in                            |    6 +-
 src/pki/man/pki---verify.1.in                      |   16 +-
 src/pki/pki.c                                      |  106 +-
 src/pki/pki.h                                      |    5 +
 src/pool/Makefile.in                               |    6 +-
 src/pt-tls-client/Makefile.am                      |    2 +-
 src/pt-tls-client/Makefile.in                      |    8 +-
 src/pt-tls-client/pt-tls-client.c                  |  118 +-
 src/scepclient/Android.mk                          |   28 +
 src/scepclient/Makefile.am                         |    1 +
 src/scepclient/Makefile.in                         |    7 +-
 src/scepclient/scepclient.c                        |    2 +-
 src/starter/Android.mk                             |   12 +-
 src/starter/Makefile.am                            |   28 +-
 src/starter/Makefile.in                            |  321 ++-
 src/starter/README                                 |  101 -
 src/starter/args.c                                 |  357 +--
 src/starter/args.h                                 |   17 +-
 src/starter/confread.c                             |  999 +++----
 src/starter/confread.h                             |   43 +-
 src/starter/ipsec-parser.h                         |   55 -
 src/starter/keywords.c                             |   47 +-
 src/starter/keywords.h                             |   13 +-
 src/starter/keywords.txt                           |    1 +
 src/starter/lexer.c                                | 1992 --------------
 src/starter/lexer.l                                |  215 --
 src/starter/parser.c                               | 1870 -------------
 src/starter/parser.h                               |  106 -
 src/starter/parser.y                               |  272 --
 src/starter/parser/conf_parser.c                   |  667 +++++
 src/starter/parser/conf_parser.h                   |  122 +
 src/starter/parser/lexer.c                         | 2737 ++++++++++++++++++++
 src/starter/parser/lexer.l                         |  205 ++
 src/starter/parser/parser.c                        | 1700 ++++++++++++
 src/starter/parser/parser.h                        |   86 +
 src/starter/parser/parser.y                        |  254 ++
 src/starter/starter.c                              |   27 +
 src/starter/starterstroke.c                        |   50 +-
 src/starter/tests/Makefile.am                      |   19 +
 src/starter/tests/Makefile.in                      |  856 ++++++
 src/starter/tests/starter_tests.c                  |   43 +
 src/starter/tests/starter_tests.h                  |   16 +
 src/starter/tests/suites/test_parser.c             |  575 ++++
 src/stroke/Makefile.in                             |    6 +-
 src/stroke/stroke.c                                |  340 +--
 src/stroke/stroke_msg.h                            |    1 +
 src/swanctl/Makefile.am                            |   66 +
 src/swanctl/Makefile.in                            |  981 +++++++
 src/swanctl/command.c                              |  309 +++
 src/swanctl/command.h                              |  108 +
 src/swanctl/commands/initiate.c                    |  132 +
 src/swanctl/commands/install.c                     |  125 +
 src/swanctl/commands/list_certs.c                  |  670 +++++
 src/swanctl/commands/list_conns.c                  |  242 ++
 src/swanctl/commands/list_pols.c                   |  210 ++
 src/swanctl/commands/list_pools.c                  |  101 +
 src/swanctl/commands/list_sas.c                    |  366 +++
 src/swanctl/commands/load_conns.c                  |  419 +++
 src/swanctl/commands/load_creds.c                  |  574 ++++
 src/swanctl/commands/load_pools.c                  |  292 +++
 src/swanctl/commands/log.c                         |  101 +
 src/swanctl/commands/stats.c                       |  118 +
 src/swanctl/commands/terminate.c                   |  157 ++
 src/swanctl/commands/version.c                     |   96 +
 src/swanctl/swanctl.8.in                           |   83 +
 src/swanctl/swanctl.c                              |   57 +
 src/swanctl/swanctl.conf                           |  306 +++
 src/swanctl/swanctl.conf.5.head.in                 |   24 +
 src/swanctl/swanctl.conf.5.main                    |  957 +++++++
 src/swanctl/swanctl.conf.5.tail.in                 |   10 +
 src/swanctl/swanctl.h                              |   69 +
 src/swanctl/swanctl.opt                            |  779 ++++++
 testing/Makefile.in                                |    6 +-
 testing/config/kernel/config-3.15                  | 2083 +++++++++++++++
 testing/do-tests                                   |   96 +-
 testing/hosts/alice/etc/swanctl/rsa/aliceKey.pem   |   27 +
 testing/hosts/alice/etc/swanctl/x509/aliceCert.pem |   25 +
 .../alice/etc/swanctl/x509ca/strongswanCert.pem    |   22 +
 testing/hosts/bob/etc/swanctl/rsa/bobKey.pem       |   27 +
 testing/hosts/bob/etc/swanctl/x509/bobCert.pem     |   25 +
 .../bob/etc/swanctl/x509ca/strongswanCert.pem      |   22 +
 testing/hosts/carol/etc/swanctl/rsa/carolKey.pem   |   27 +
 testing/hosts/carol/etc/swanctl/x509/carolCert.pem |   25 +
 .../carol/etc/swanctl/x509ca/strongswanCert.pem    |   22 +
 testing/hosts/dave/etc/swanctl/rsa/daveKey.pem     |   27 +
 testing/hosts/dave/etc/swanctl/x509/daveCert.pem   |   25 +
 .../dave/etc/swanctl/x509ca/strongswanCert.pem     |   22 +
 testing/hosts/default/etc/hosts                    |    2 +-
 testing/hosts/default/etc/init.d/charon            |  156 ++
 testing/hosts/moon/etc/swanctl/rsa/moonKey.pem     |   27 +
 testing/hosts/moon/etc/swanctl/x509/moonCert.pem   |   25 +
 .../moon/etc/swanctl/x509ca/strongswanCert.pem     |   22 +
 testing/hosts/sun/etc/swanctl/rsa/sunKey.pem       |   27 +
 testing/hosts/sun/etc/swanctl/x509/sunCert.pem     |   25 +
 .../sun/etc/swanctl/x509ca/strongswanCert.pem      |   22 +
 testing/hosts/venus/etc/swanctl/rsa/venusKey.pem   |   27 +
 testing/hosts/venus/etc/swanctl/x509/venusCert.pem |   24 +
 .../venus/etc/swanctl/x509ca/strongswanCert.pem    |   22 +
 testing/hosts/winnetou/etc/openssl/index.txt       |    5 +-
 testing/hosts/winnetou/etc/openssl/index.txt.old   |    6 +-
 testing/hosts/winnetou/etc/openssl/newcerts/29.pem |   25 +
 testing/hosts/winnetou/etc/openssl/serial          |    2 +-
 testing/hosts/winnetou/etc/openssl/serial.old      |    2 +-
 testing/scripts/build-baseimage                    |    4 +-
 testing/scripts/build-guestimages                  |    9 +-
 testing/scripts/recipes/014_swid_generator.mk      |   16 +
 testing/scripts/recipes/015_strongTNC.mk           |   22 +
 testing/testing.conf                               |   12 +-
 .../hosts/moon/etc/ipsec.d/aacerts/aa.pem          |   19 +
 .../etc/ipsec.d/acerts/carol-sales-finance.pem     |   18 +
 .../moon/etc/ipsec.d/acerts/dave-marketing.pem     |   18 +
 .../moon/etc/ipsec.d/acerts/dave-sales-expired.pem |   18 +
 .../hosts/moon/etc/ipsec.d/private/aa.pem          |   27 +
 .../etc/ipsec.d/acerts/carol-finance-expired.pem   |   18 +
 .../hosts/carol/etc/ipsec.d/acerts/carol-sales.pem |   18 +
 .../hosts/moon/etc/ipsec.d/aacerts/aa.pem          |   19 +
 .../hosts/moon/etc/ipsec.d/private/aa.pem          |   27 +
 .../hosts/carol/etc/ipsec.d/acerts/carol-sales.pem |   18 +
 .../dave/etc/ipsec.d/acerts/dave-expired-aa.pem    |   18 +
 .../dave/etc/ipsec.d/acerts/dave-marketing.pem     |   18 +
 .../hosts/moon/etc/ipsec.d/aacerts/aa-expired.pem  |   19 +
 .../hosts/moon/etc/ipsec.d/aacerts/aa.pem          |   19 +
 .../hosts/moon/etc/ipsec.d/private/aa-expired.pem  |   27 +
 .../hosts/moon/etc/ipsec.d/private/aa.pem          |   27 +
 .../ikev2/shunt-policies-nat-rw/description.txt    |    7 +
 .../tests/ikev2/shunt-policies-nat-rw/evaltest.dat |   12 +
 .../hosts/alice/etc/ipsec.conf                     |   27 +
 .../hosts/alice/etc/strongswan.conf                |    7 +
 .../shunt-policies-nat-rw/hosts/sun/etc/ipsec.conf |   20 +
 .../hosts/sun/etc/iptables.rules                   |   24 +
 .../hosts/sun/etc/strongswan.conf                  |    5 +
 .../hosts/venus/etc/ipsec.conf                     |   27 +
 .../hosts/venus/etc/strongswan.conf                |    7 +
 .../tests/ikev2/shunt-policies-nat-rw/posttest.dat |    5 +
 .../tests/ikev2/shunt-policies-nat-rw/pretest.dat  |   11 +
 .../tests/ikev2/shunt-policies-nat-rw/test.conf    |   21 +
 testing/tests/ikev2/shunt-policies/description.txt |   11 -
 testing/tests/ikev2/shunt-policies/evaltest.dat    |   16 -
 .../ikev2/shunt-policies/hosts/moon/etc/ipsec.conf |   40 -
 .../shunt-policies/hosts/moon/etc/iptables.rules   |   32 -
 .../shunt-policies/hosts/moon/etc/strongswan.conf  |    7 -
 .../ikev2/shunt-policies/hosts/sun/etc/ipsec.conf  |   22 -
 .../shunt-policies/hosts/sun/etc/strongswan.conf   |    6 -
 testing/tests/ikev2/shunt-policies/posttest.dat    |    5 -
 testing/tests/ikev2/shunt-policies/pretest.dat     |    6 -
 testing/tests/ikev2/shunt-policies/test.conf       |   21 -
 .../carol/etc/ipsec.d/certs/carolCert-002.pem      |   34 +-
 .../carol/etc/ipsec.d/private/carolKey-002.pem     |   50 +-
 .../hosts/moon/etc/ipsec.d/certs/moonCert.asc      |   15 +
 .../hosts/moon/etc/ipsec.d/certs/sunCert.asc       |   15 +
 .../hosts/moon/etc/ipsec.d/private/moonKey.asc     |   19 +
 .../hosts/sun/etc/ipsec.d/certs/moonCert.asc       |   15 +
 .../hosts/sun/etc/ipsec.d/certs/sunCert.asc        |   15 +
 .../hosts/sun/etc/ipsec.d/private/sunKey.asc       |   19 +
 testing/tests/pfkey/compress/description.txt       |    4 +
 testing/tests/pfkey/compress/evaltest.dat          |   12 +
 .../pfkey/compress/hosts/carol/etc/ipsec.conf      |   21 +
 .../pfkey/compress/hosts/carol/etc/strongswan.conf |    5 +
 .../tests/pfkey/compress/hosts/moon/etc/ipsec.conf |   21 +
 .../pfkey/compress/hosts/moon/etc/strongswan.conf  |    5 +
 testing/tests/pfkey/compress/posttest.dat          |    4 +
 testing/tests/pfkey/compress/pretest.dat           |    6 +
 testing/tests/pfkey/compress/test.conf             |   22 +
 .../pfkey/shunt-policies-nat-rw/description.txt    |    7 +
 .../tests/pfkey/shunt-policies-nat-rw/evaltest.dat |   12 +
 .../hosts/alice/etc/ipsec.conf                     |   27 +
 .../hosts/alice/etc/strongswan.conf                |    7 +
 .../shunt-policies-nat-rw/hosts/sun/etc/ipsec.conf |   20 +
 .../hosts/sun/etc/iptables.rules                   |   24 +
 .../hosts/sun/etc/strongswan.conf                  |    5 +
 .../hosts/venus/etc/ipsec.conf                     |   27 +
 .../hosts/venus/etc/strongswan.conf                |    7 +
 .../tests/pfkey/shunt-policies-nat-rw/posttest.dat |    5 +
 .../tests/pfkey/shunt-policies-nat-rw/pretest.dat  |   11 +
 .../tests/pfkey/shunt-policies-nat-rw/test.conf    |   21 +
 testing/tests/pfkey/shunt-policies/description.txt |   11 -
 testing/tests/pfkey/shunt-policies/evaltest.dat    |   20 -
 .../pfkey/shunt-policies/hosts/moon/etc/ipsec.conf |   40 -
 .../shunt-policies/hosts/moon/etc/iptables.rules   |   32 -
 .../shunt-policies/hosts/moon/etc/strongswan.conf  |    7 -
 .../pfkey/shunt-policies/hosts/sun/etc/ipsec.conf  |   22 -
 .../shunt-policies/hosts/sun/etc/strongswan.conf   |    6 -
 testing/tests/pfkey/shunt-policies/posttest.dat    |    5 -
 testing/tests/pfkey/shunt-policies/pretest.dat     |    6 -
 testing/tests/pfkey/shunt-policies/test.conf       |   21 -
 .../sql/shunt-policies-nat-rw/description.txt      |    7 +
 .../tests/sql/shunt-policies-nat-rw/evaltest.dat   |   12 +
 .../hosts/alice/etc/ipsec.conf                     |    3 +
 .../hosts/alice/etc/ipsec.d/data.sql               |  199 ++
 .../hosts/alice}/etc/ipsec.secrets                 |    0
 .../hosts/alice/etc/strongswan.conf                |   12 +
 .../shunt-policies-nat-rw/hosts/sun/etc/ipsec.conf |    3 +
 .../hosts/sun/etc/ipsec.d/data.sql                 |  195 ++
 .../hosts/sun/etc/ipsec.secrets                    |    0
 .../hosts/sun/etc/iptables.rules                   |   24 +
 .../hosts/sun/etc/strongswan.conf                  |   13 +
 .../hosts/venus/etc/ipsec.conf                     |    3 +
 .../hosts/venus/etc/ipsec.d/data.sql               |  199 ++
 .../hosts/venus}/etc/ipsec.secrets                 |    0
 .../hosts/venus/etc/strongswan.conf                |   12 +
 .../tests/sql/shunt-policies-nat-rw/posttest.dat   |    8 +
 .../tests/sql/shunt-policies-nat-rw/pretest.dat    |   20 +
 testing/tests/sql/shunt-policies-nat-rw/test.conf  |   21 +
 testing/tests/sql/shunt-policies/description.txt   |   11 -
 testing/tests/sql/shunt-policies/evaltest.dat      |   20 -
 .../sql/shunt-policies/hosts/moon/etc/ipsec.conf   |    5 -
 .../shunt-policies/hosts/moon/etc/ipsec.d/data.sql |  227 --
 .../shunt-policies/hosts/moon/etc/iptables.rules   |   32 -
 .../shunt-policies/hosts/moon/etc/strongswan.conf  |   11 -
 .../sql/shunt-policies/hosts/sun/etc/ipsec.conf    |    5 -
 .../shunt-policies/hosts/sun/etc/ipsec.d/data.sql  |  152 --
 .../shunt-policies/hosts/sun/etc/strongswan.conf   |   10 -
 testing/tests/sql/shunt-policies/posttest.dat      |    6 -
 testing/tests/sql/shunt-policies/pretest.dat       |   12 -
 testing/tests/swanctl/ip-pool-db/description.txt   |   10 +
 testing/tests/swanctl/ip-pool-db/evaltest.dat      |   23 +
 .../ip-pool-db/hosts/carol/etc/strongswan.conf     |   11 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   33 +
 .../ip-pool-db/hosts/dave/etc/strongswan.conf      |   11 +
 .../ip-pool-db/hosts/dave/etc/swanctl/swanctl.conf |   33 +
 .../ip-pool-db/hosts/moon/etc/strongswan.conf      |   21 +
 .../ip-pool-db/hosts/moon/etc/swanctl/swanctl.conf |   31 +
 testing/tests/swanctl/ip-pool-db/posttest.dat      |   11 +
 testing/tests/swanctl/ip-pool-db/pretest.dat       |   21 +
 testing/tests/swanctl/ip-pool-db/test.conf         |   21 +
 testing/tests/swanctl/ip-pool/description.txt      |   10 +
 testing/tests/swanctl/ip-pool/evaltest.dat         |   15 +
 .../ip-pool/hosts/carol/etc/strongswan.conf        |   13 +
 .../ip-pool/hosts/carol/etc/swanctl/swanctl.conf   |   33 +
 .../swanctl/ip-pool/hosts/dave/etc/strongswan.conf |   13 +
 .../ip-pool/hosts/dave/etc/swanctl/swanctl.conf    |   33 +
 .../swanctl/ip-pool/hosts/moon/etc/strongswan.conf |   13 +
 .../ip-pool/hosts/moon/etc/swanctl/swanctl.conf    |   37 +
 testing/tests/swanctl/ip-pool/posttest.dat         |    8 +
 testing/tests/swanctl/ip-pool/pretest.dat          |   15 +
 testing/tests/swanctl/ip-pool/test.conf            |   21 +
 testing/tests/swanctl/net2net-cert/description.txt |    6 +
 testing/tests/swanctl/net2net-cert/evaltest.dat    |    5 +
 .../net2net-cert/hosts/moon/etc/strongswan.conf    |   13 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   34 +
 .../net2net-cert/hosts/sun/etc/strongswan.conf     |   13 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |   34 +
 testing/tests/swanctl/net2net-cert/posttest.dat    |    5 +
 testing/tests/swanctl/net2net-cert/pretest.dat     |    9 +
 .../net2net-cert}/test.conf                        |    0
 .../tests/swanctl/net2net-route/description.txt    |    9 +
 testing/tests/swanctl/net2net-route/evaltest.dat   |    7 +
 .../net2net-route/hosts/moon/etc/strongswan.conf   |   13 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   34 +
 .../net2net-route/hosts/sun/etc/strongswan.conf    |   13 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |   34 +
 testing/tests/swanctl/net2net-route/posttest.dat   |    5 +
 testing/tests/swanctl/net2net-route/pretest.dat    |    9 +
 .../net2net-route}/test.conf                       |    0
 .../tests/swanctl/net2net-start/description.txt    |    6 +
 testing/tests/swanctl/net2net-start/evaltest.dat   |    5 +
 .../net2net-start/hosts/moon/etc/strongswan.conf   |   13 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   34 +
 .../net2net-start/hosts/sun/etc/strongswan.conf    |   13 +
 .../hosts/sun/etc/swanctl/swanctl.conf             |   34 +
 testing/tests/swanctl/net2net-start/posttest.dat   |    5 +
 testing/tests/swanctl/net2net-start/pretest.dat    |    9 +
 .../net2net-start}/test.conf                       |    0
 testing/tests/swanctl/rw-cert/description.txt      |    6 +
 testing/tests/swanctl/rw-cert/evaltest.dat         |   10 +
 .../rw-cert/hosts/carol/etc/strongswan.conf        |   13 +
 .../rw-cert/hosts/carol/etc/swanctl/swanctl.conf   |   32 +
 .../swanctl/rw-cert/hosts/dave/etc/strongswan.conf |   13 +
 .../rw-cert/hosts/dave/etc/swanctl/swanctl.conf    |   32 +
 .../swanctl/rw-cert/hosts/moon/etc/strongswan.conf |   13 +
 .../rw-cert/hosts/moon/etc/swanctl/swanctl.conf    |   30 +
 testing/tests/swanctl/rw-cert/posttest.dat         |    8 +
 testing/tests/swanctl/rw-cert/pretest.dat          |   14 +
 testing/tests/swanctl/rw-cert/test.conf            |   21 +
 testing/tests/swanctl/rw-psk-fqdn/description.txt  |    6 +
 testing/tests/swanctl/rw-psk-fqdn/evaltest.dat     |   10 +
 .../rw-psk-fqdn/hosts/carol/etc/strongswan.conf    |   13 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   41 +
 .../rw-psk-fqdn/hosts/dave/etc/strongswan.conf     |   13 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   39 +
 .../rw-psk-fqdn/hosts/moon/etc/strongswan.conf     |   13 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   41 +
 testing/tests/swanctl/rw-psk-fqdn/posttest.dat     |    8 +
 testing/tests/swanctl/rw-psk-fqdn/pretest.dat      |   17 +
 testing/tests/swanctl/rw-psk-fqdn/test.conf        |   21 +
 testing/tests/swanctl/rw-psk-ipv4/description.txt  |    6 +
 testing/tests/swanctl/rw-psk-ipv4/evaltest.dat     |   10 +
 .../rw-psk-ipv4/hosts/carol/etc/strongswan.conf    |   13 +
 .../hosts/carol/etc/swanctl/swanctl.conf           |   40 +
 .../rw-psk-ipv4/hosts/dave/etc/strongswan.conf     |   13 +
 .../hosts/dave/etc/swanctl/swanctl.conf            |   39 +
 .../rw-psk-ipv4/hosts/moon/etc/strongswan.conf     |   13 +
 .../hosts/moon/etc/swanctl/swanctl.conf            |   40 +
 testing/tests/swanctl/rw-psk-ipv4/posttest.dat     |    8 +
 testing/tests/swanctl/rw-psk-ipv4/pretest.dat      |   17 +
 testing/tests/swanctl/rw-psk-ipv4/test.conf        |   21 +
 .../tnccs-11-fhh/hosts/carol/etc/strongswan.conf   |    7 +
 .../tnccs-11-fhh/hosts/dave/etc/strongswan.conf    |    7 +
 .../tnccs-11-fhh/hosts/moon/etc/strongswan.conf    |    8 +-
 .../hosts/carol/etc/strongswan.conf                |    7 +
 .../hosts/dave/etc/strongswan.conf                 |    7 +
 .../hosts/alice/etc/pts/data1.sql                  |    2 +-
 .../hosts/carol/etc/strongswan.conf                |    7 +
 .../hosts/dave/etc/strongswan.conf                 |    7 +
 .../hosts/carol/etc/strongswan.conf                |    7 +
 .../tnccs-11-radius/hosts/dave/etc/strongswan.conf |    7 +
 .../tnc/tnccs-11/hosts/carol/etc/strongswan.conf   |    7 +
 .../tnc/tnccs-11/hosts/dave/etc/strongswan.conf    |    7 +
 .../tnc/tnccs-11/hosts/moon/etc/strongswan.conf    |    8 +-
 .../tnccs-20-block/hosts/carol/etc/strongswan.conf |    7 +-
 .../tnccs-20-block/hosts/dave/etc/strongswan.conf  |    5 +-
 .../tnccs-20-block/hosts/moon/etc/strongswan.conf  |    7 +-
 .../hosts/carol/etc/strongswan.conf                |    8 +-
 .../hosts/dave/etc/strongswan.conf                 |    7 +-
 .../hosts/moon/etc/strongswan.conf                 |    7 +-
 .../tnccs-20-fhh/hosts/carol/etc/strongswan.conf   |    8 +-
 .../tnccs-20-fhh/hosts/dave/etc/strongswan.conf    |    8 +-
 .../tnccs-20-fhh/hosts/moon/etc/strongswan.conf    |    7 +-
 testing/tests/tnc/tnccs-20-os-pts/description.txt  |   22 +
 testing/tests/tnc/tnccs-20-os-pts/evaltest.dat     |   20 +
 .../tnc/tnccs-20-os-pts/hosts/carol/etc/ipsec.conf |   23 +
 .../tnccs-20-os-pts/hosts/carol/etc/ipsec.secrets  |    3 +
 .../hosts/carol/etc/strongswan.conf                |   15 +
 .../tnc/tnccs-20-os-pts/hosts/carol/etc/tnc_config |    4 +
 .../tnc/tnccs-20-os-pts/hosts/dave/etc/ipsec.conf  |   23 +
 .../tnccs-20-os-pts/hosts/dave/etc/ipsec.secrets   |    3 +
 .../tnccs-20-os-pts/hosts/dave/etc/strongswan.conf |   21 +
 .../tnc/tnccs-20-os-pts/hosts/dave/etc/tnc_config  |    4 +
 .../tnc/tnccs-20-os-pts/hosts/moon/etc/ipsec.conf  |   34 +
 .../tnccs-20-os-pts/hosts/moon/etc/ipsec.secrets   |    6 +
 .../tnccs-20-os-pts/hosts/moon/etc/pts/data1.sql   |   29 +
 .../tnccs-20-os-pts/hosts/moon/etc/strongswan.conf |   31 +
 .../hosts/moon/etc/tnc_config                      |    0
 testing/tests/tnc/tnccs-20-os-pts/posttest.dat     |    8 +
 testing/tests/tnc/tnccs-20-os-pts/pretest.dat      |   18 +
 testing/tests/tnc/tnccs-20-os-pts/test.conf        |   26 +
 testing/tests/tnc/tnccs-20-os/description.txt      |   13 +-
 testing/tests/tnc/tnccs-20-os/evaltest.dat         |    4 +-
 .../tnccs-20-os/hosts/carol/etc/strongswan.conf    |    8 +-
 .../tnc/tnccs-20-os/hosts/dave/etc/strongswan.conf |    7 +-
 .../tnc/tnccs-20-os/hosts/moon/etc/pts/data1.sql   |    4 +-
 .../tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf |    7 +-
 testing/tests/tnc/tnccs-20-os/pretest.dat          |    2 +-
 .../description.txt                                |    0
 testing/tests/tnc/tnccs-20-pdp-eap/evaltest.dat    |   29 +
 .../alice/etc/apache2/sites-available/default      |   26 +
 .../tnccs-20-pdp-eap/hosts/alice/etc/ipsec.conf    |    9 +
 .../hosts/alice/etc/ipsec.d/certs/aaaCert.pem      |    0
 .../hosts/alice/etc/ipsec.d/private/aaaKey.pem     |    0
 .../hosts/alice/etc/ipsec.secrets                  |    0
 .../tnccs-20-pdp-eap/hosts/alice/etc/pts/data1.sql |   61 +
 .../hosts/alice/etc/strongTNC/settings.ini         |   19 +
 .../hosts/alice/etc/strongswan.conf                |   35 +
 .../hosts/alice/etc/tnc_config                     |    0
 .../tnccs-20-pdp-eap/hosts/carol/etc/ipsec.conf    |   23 +
 .../hosts/carol/etc/ipsec.secrets                  |    0
 .../hosts/carol/etc/strongswan.conf                |   18 +
 .../tnccs-20-pdp-eap/hosts/carol/etc/tnc_config    |    4 +
 .../tnc/tnccs-20-pdp-eap/hosts/dave/etc/ipsec.conf |   23 +
 .../hosts/dave/etc/ipsec.secrets                   |    0
 .../hosts/dave/etc/strongswan.conf                 |   30 +
 .../tnc/tnccs-20-pdp-eap/hosts/dave/etc/tnc_config |    4 +
 .../hosts/moon/etc/ipsec.conf                      |    0
 .../hosts/moon/etc/ipsec.secrets                   |    0
 .../hosts/moon/etc/iptables.rules                  |    0
 .../hosts/moon/etc/strongswan.conf                 |    0
 testing/tests/tnc/tnccs-20-pdp-eap/posttest.dat    |    9 +
 testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat     |   21 +
 .../{tnccs-20-pdp => tnccs-20-pdp-eap}/test.conf   |    0
 .../description.txt                                |    0
 testing/tests/tnc/tnccs-20-pdp-pt-tls/evaltest.dat |   19 +
 .../alice/etc/apache2/sites-available/default      |   26 +
 .../tnccs-20-pdp-pt-tls/hosts/alice/etc/ipsec.conf |    9 +
 .../hosts/alice/etc/ipsec.d/certs/aaaCert.pem      |    0
 .../hosts/alice/etc/ipsec.d/private/aaaKey.pem     |    0
 .../hosts/alice/etc/ipsec.secrets                  |    0
 .../hosts/alice/etc/iptables.rules                 |   24 +
 .../hosts/alice/etc/pts/data1.sql                  |   61 +
 .../hosts/alice/etc/strongTNC/settings.ini         |   19 +
 .../hosts/alice/etc/strongswan.conf                |   29 +
 .../hosts/alice/etc/tnc_config                     |    0
 .../hosts/carol/etc/ipsec.conf                     |    0
 .../hosts/carol/etc/ipsec.secrets                  |    0
 .../hosts/carol/etc/ipsec.sql                      |    0
 .../hosts/carol/etc/iptables.rules                 |    0
 .../hosts/carol/etc/pts/options                    |    6 +
 .../hosts/carol/etc/strongswan.conf                |    9 +
 .../hosts/carol/etc/tnc_config                     |    0
 .../hosts/dave/etc/ipsec.conf                      |    0
 .../hosts/dave/etc/ipsec.secrets                   |    0
 .../hosts/dave/etc/ipsec.sql                       |    0
 .../hosts/dave/etc/iptables.rules                  |    0
 .../tnccs-20-pdp-pt-tls/hosts/dave/etc/pts/options |    7 +
 .../hosts/dave/etc/strongswan.conf                 |   21 +
 .../hosts/dave/etc/tnc_config                      |    0
 testing/tests/tnc/tnccs-20-pdp-pt-tls/posttest.dat |    9 +
 testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat  |   23 +
 .../test.conf                                      |    0
 testing/tests/tnc/tnccs-20-pdp/evaltest.dat        |   22 -
 .../tnc/tnccs-20-pdp/hosts/alice/etc/ipsec.conf    |    9 -
 .../tnccs-20-pdp/hosts/alice/etc/strongswan.conf   |   30 -
 .../tnc/tnccs-20-pdp/hosts/alice/etc/tnc_config    |    4 -
 .../tnc/tnccs-20-pdp/hosts/carol/etc/ipsec.conf    |   23 -
 .../tnccs-20-pdp/hosts/carol/etc/strongswan.conf   |   18 -
 .../tnc/tnccs-20-pdp/hosts/carol/etc/tnc_config    |    4 -
 .../tnc/tnccs-20-pdp/hosts/dave/etc/ipsec.conf     |   23 -
 .../tnccs-20-pdp/hosts/dave/etc/strongswan.conf    |   21 -
 .../tnc/tnccs-20-pdp/hosts/dave/etc/tnc_config     |    4 -
 testing/tests/tnc/tnccs-20-pdp/posttest.dat        |    7 -
 testing/tests/tnc/tnccs-20-pdp/pretest.dat         |   14 -
 testing/tests/tnc/tnccs-20-pt-tls/evaltest.dat     |   12 -
 .../tnc/tnccs-20-pt-tls/hosts/alice/etc/ipsec.conf |    9 -
 .../tnccs-20-pt-tls/hosts/alice/etc/iptables.rules |   20 -
 .../tnccs-20-pt-tls/hosts/alice/etc/pts/data1.sql  |   61 -
 .../hosts/alice/etc/strongswan.conf                |   28 -
 .../tnccs-20-pt-tls/hosts/carol/etc/pts/options    |    5 -
 .../hosts/carol/etc/strongswan.conf                |   25 -
 .../tnc/tnccs-20-pt-tls/hosts/dave/etc/pts/options |    6 -
 .../tnccs-20-pt-tls/hosts/dave/etc/strongswan.conf |   22 -
 testing/tests/tnc/tnccs-20-pt-tls/posttest.dat     |    8 -
 testing/tests/tnc/tnccs-20-pt-tls/pretest.dat      |   19 -
 .../tests/tnc/tnccs-20-pts-no-ecc/description.txt  |   15 +-
 testing/tests/tnc/tnccs-20-pts-no-ecc/evaltest.dat |    4 +-
 .../hosts/carol/etc/strongswan.conf                |    8 +-
 .../hosts/dave/etc/strongswan.conf                 |    7 +-
 .../hosts/moon/etc/pts/data1.sql                   |    2 +-
 .../hosts/moon/etc/strongswan.conf                 |    7 +-
 testing/tests/tnc/tnccs-20-pts/description.txt     |   13 +-
 testing/tests/tnc/tnccs-20-pts/evaltest.dat        |   16 +-
 .../tnccs-20-pts/hosts/carol/etc/strongswan.conf   |    8 +-
 .../tnccs-20-pts/hosts/dave/etc/strongswan.conf    |    6 +-
 .../tnc/tnccs-20-pts/hosts/moon/etc/pts/data1.sql  |    2 +-
 .../tnccs-20-pts/hosts/moon/etc/strongswan.conf    |    7 +-
 .../tnc/tnccs-20-pts/hosts/moon/etc/tnc_config     |    1 -
 .../tnc/tnccs-20-server-retry/description.txt      |    9 +-
 .../hosts/carol/etc/strongswan.conf                |    8 +-
 .../hosts/dave/etc/strongswan.conf                 |    7 +-
 .../hosts/moon/etc/strongswan.conf                 |    7 +-
 testing/tests/tnc/tnccs-20-tls/description.txt     |    9 +-
 .../tnccs-20-tls/hosts/carol/etc/strongswan.conf   |    8 +-
 .../tnccs-20-tls/hosts/dave/etc/strongswan.conf    |    8 +-
 .../tnccs-20-tls/hosts/moon/etc/strongswan.conf    |   17 +-
 .../tnc/tnccs-20/hosts/carol/etc/strongswan.conf   |    8 +-
 .../tnc/tnccs-20/hosts/dave/etc/strongswan.conf    |    7 +-
 .../tnc/tnccs-20/hosts/moon/etc/strongswan.conf    |    7 +-
 testing/tests/tnc/tnccs-dynamic/description.txt    |    1 +
 .../tnccs-dynamic/hosts/carol/etc/strongswan.conf  |    5 +
 .../tnccs-dynamic/hosts/dave/etc/strongswan.conf   |    5 +
 .../tnccs-dynamic/hosts/moon/etc/strongswan.conf   |    1 +
 1308 files changed, 74062 insertions(+), 22894 deletions(-)

diff --cc debian/changelog
index 06f565e,a505fbe..dbec3da
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,20 +1,27 @@@
+ strongswan (5.2.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   [ Romain Francoise ]
+   * Amend build-dep on libgcrypt to 'libgcrypt20-dev | libgcrypt11-dev'.
+   * Drop hardening-wrapper from build-depends (unused since 5.0.4-1).
+ 
+   [ Yves-Alexis Perez ]
+   * debian/po:
+     - pt_BR.po updated, thanks Adriano Rafael Gomes.            closes: #752721
+   * debian/patches:
+     03_pfkey-Always-include-stdint.h dropped, included upstream.
+   * debian/strongswan-starter.install:
+     - replace tools.conf by pki.conf and scepclient.conf.
+ 
+  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Jul 2014 21:57:59 +0200
+ 
 +strongswan (5.1.3-4~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +  * Amend build-dep on libgcrypt to 'libgcrypt20-dev | libgcrypt11-dev'.
 +
 + -- Romain Francoise <rfrancoise at debian.org>  Sun, 25 May 2014 11:06:51 +0200
 +
  strongswan (5.1.3-4) unstable; urgency=medium
  
    * debian/control:

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