[Pkg-swan-devel] [strongswan] 03/04: Merge tag 'v5.1.2-3' into strongswan-wheezy-backports

Romain Francoise rfrancoise at moszumanska.debian.org
Tue Apr 8 17:57:48 UTC 2014


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

rfrancoise pushed a commit to annotated tag v5.1.2-3_bpo70+1
in repository strongswan.

commit 8b80676e37cbe7ea642c731e4b5dc258c19dafa9
Merge: 36aa526 0806a80
Author: Romain Francoise <rfrancoise at debian.org>
Date:   Tue Apr 8 19:36:44 2014 +0200

    Merge tag 'v5.1.2-3' into strongswan-wheezy-backports
    
    Tag strongSwan 5.1.2-3
    
    * tag 'v5.1.2-3':
      upload
      Add patch to fix testsuite failure on armel
      debian/patches/ 02_unit-tests-Fix-filtered-enumerator-tests-on-64-bit-b.patch added, fix testsuite failing on 64 bit big-endian platforms (s390x).
      upload
      export TESTS_REDUCED_KEYLENGTHS for non linux/x86 arches
      upload
      advertise about the new strongswan.d mechanism
      Fix spurious entry in debian/NEWS.
      Install configuration files for all plugins
      02_include-strongswan.conf.d removed, strongswan.d is now supported upstream.
      Refresh patches
      New upstream release.
      Imported Upstream version 5.1.2
      stop lying about ipsec showhostkey command
      Remove /var/lib/strongswan on purge
      Conflicts against openSwan

 Android.common.mk                                  |    2 +-
 Android.mk                                         |    3 +-
 Doxyfile.in                                        |    2 +-
 Makefile.am                                        |   17 +-
 Makefile.in                                        |   32 +-
 NEWS                                               |   46 +
 aclocal.m4                                         |  272 +++
 conf/Makefile.am                                   |  163 ++
 conf/Makefile.in                                   |  873 +++++++++
 conf/default.conf                                  |    8 +
 conf/default.opt                                   |    3 +
 conf/format-options.py                             |  337 ++++
 conf/options/attest.conf                           |   11 +
 conf/options/attest.opt                            |    6 +
 conf/options/charon-logging.conf                   |   62 +
 conf/options/charon-logging.opt                    |   57 +
 conf/options/charon.conf                           |  281 +++
 conf/options/charon.opt                            |  284 +++
 conf/options/imcv.conf                             |   43 +
 conf/options/imcv.opt                              |   28 +
 conf/options/manager.conf                          |   23 +
 conf/options/manager.opt                           |   18 +
 conf/options/medsrv.conf                           |   32 +
 conf/options/medsrv.opt                            |   27 +
 conf/options/pacman.conf                           |   12 +
 conf/options/pacman.opt                            |    7 +
 conf/options/pool.conf                             |   12 +
 conf/options/pool.opt                              |    7 +
 conf/options/starter.conf                          |   10 +
 conf/options/starter.opt                           |    5 +
 conf/options/tnc.conf                              |   11 +
 conf/options/tnc.opt                               |    2 +
 conf/options/tools.conf                            |   21 +
 conf/options/tools.opt                             |    8 +
 conf/plugins/android_log.conf                      |   11 +
 conf/plugins/android_log.opt                       |    2 +
 conf/plugins/attr-sql.conf                         |   16 +
 conf/plugins/attr-sql.opt                          |    6 +
 conf/plugins/attr.conf                             |   14 +
 conf/plugins/attr.opt                              |   14 +
 conf/plugins/certexpire.conf                       |   38 +
 conf/plugins/certexpire.opt                        |   25 +
 conf/plugins/coupling.conf                         |   17 +
 conf/plugins/coupling.opt                          |    8 +
 conf/plugins/dhcp.conf                             |   20 +
 conf/plugins/dhcp.opt                              |   22 +
 conf/plugins/dnscert.conf                          |   11 +
 conf/plugins/dnscert.opt                           |    2 +
 conf/plugins/duplicheck.conf                       |   14 +
 conf/plugins/duplicheck.opt                        |    5 +
 conf/plugins/eap-aka-3ggp2.conf                    |   10 +
 conf/plugins/eap-aka-3ggp2.opt                     |    1 +
 conf/plugins/eap-aka.conf                          |   10 +
 conf/plugins/eap-aka.opt                           |    1 +
 conf/plugins/eap-dynamic.conf                      |   14 +
 conf/plugins/eap-dynamic.opt                       |   13 +
 conf/plugins/eap-gtc.conf                          |   11 +
 conf/plugins/eap-gtc.opt                           |    2 +
 conf/plugins/eap-peap.conf                         |   30 +
 conf/plugins/eap-peap.opt                          |   20 +
 conf/plugins/eap-radius.conf                       |   86 +
 conf/plugins/eap-radius.opt                        |  105 +
 conf/plugins/eap-sim.conf                          |   10 +
 conf/plugins/eap-sim.opt                           |    1 +
 conf/plugins/eap-simaka-sql.conf                   |   12 +
 conf/plugins/eap-simaka-sql.opt                    |    3 +
 conf/plugins/eap-tls.conf                          |   17 +
 conf/plugins/eap-tls.opt                           |    8 +
 conf/plugins/eap-tnc.conf                          |   15 +
 conf/plugins/eap-tnc.opt                           |    6 +
 conf/plugins/eap-ttls.conf                         |   30 +
 conf/plugins/eap-ttls.opt                          |   20 +
 conf/plugins/error-notify.conf                     |   11 +
 conf/plugins/error-notify.opt                      |    2 +
 conf/plugins/gcrypt.conf                           |   11 +
 conf/plugins/gcrypt.opt                            |    2 +
 conf/plugins/ha.conf                               |   32 +
 conf/plugins/ha.opt                                |   23 +
 conf/plugins/imc-attestation.conf                  |   26 +
 conf/plugins/imc-attestation.opt                   |   17 +
 conf/plugins/imc-os.conf                           |   11 +
 conf/plugins/imc-os.opt                            |    2 +
 conf/plugins/imc-scanner.conf                      |   11 +
 conf/plugins/imc-scanner.opt                       |    2 +
 conf/plugins/imc-swid.conf                         |   11 +
 conf/plugins/imc-swid.opt                          |    2 +
 conf/plugins/imc-test.conf                         |   23 +
 conf/plugins/imc-test.opt                          |   14 +
 conf/plugins/imv-attestation.conf                  |   42 +
 conf/plugins/imv-attestation.opt                   |   29 +
 conf/plugins/imv-os.conf                           |   11 +
 conf/plugins/imv-os.opt                            |    2 +
 conf/plugins/imv-scanner.conf                      |   11 +
 conf/plugins/imv-scanner.opt                       |    2 +
 conf/plugins/imv-test.conf                         |   11 +
 conf/plugins/imv-test.opt                          |    2 +
 conf/plugins/ipseckey.conf                         |   11 +
 conf/plugins/ipseckey.opt                          |    2 +
 conf/plugins/kernel-klips.conf                     |   14 +
 conf/plugins/kernel-klips.opt                      |    5 +
 conf/plugins/kernel-libipsec.conf                  |   11 +
 conf/plugins/kernel-libipsec.opt                   |    7 +
 conf/plugins/kernel-netlink.conf                   |   19 +
 conf/plugins/kernel-netlink.opt                    |   18 +
 conf/plugins/kernel-pfroute.conf                   |   12 +
 conf/plugins/kernel-pfroute.opt                    |    3 +
 conf/plugins/led.conf                              |   12 +
 conf/plugins/led.opt                               |    3 +
 conf/plugins/load-tester.conf                      |  138 ++
 conf/plugins/load-tester.opt                       |  128 ++
 conf/plugins/lookip.conf                           |   11 +
 conf/plugins/lookip.opt                            |    2 +
 conf/plugins/ntru.conf                             |   17 +
 conf/plugins/ntru.opt                              |    8 +
 conf/plugins/openssl.conf                          |   14 +
 conf/plugins/openssl.opt                           |    5 +
 conf/plugins/pkcs11.conf                           |   37 +
 conf/plugins/pkcs11.opt                            |   26 +
 conf/plugins/radattr.conf                          |   15 +
 conf/plugins/radattr.opt                           |    9 +
 conf/plugins/random.conf                           |   18 +
 conf/plugins/random.opt                            |    9 +
 conf/plugins/resolve.conf                          |   18 +
 conf/plugins/resolve.opt                           |   11 +
 conf/plugins/socket-default.conf                   |   20 +
 conf/plugins/socket-default.opt                    |   11 +
 conf/plugins/sql.conf                              |   15 +
 conf/plugins/sql.opt                               |    6 +
 conf/plugins/stroke.conf                           |   24 +
 conf/plugins/stroke.opt                            |   15 +
 conf/plugins/systime-fix.conf                      |   22 +
 conf/plugins/systime-fix.opt                       |   12 +
 conf/plugins/tnc-ifmap.conf                        |   30 +
 conf/plugins/tnc-ifmap.opt                         |   21 +
 conf/plugins/tnc-imc.conf                          |   14 +
 conf/plugins/tnc-imc.opt                           |    5 +
 conf/plugins/tnc-imv.conf                          |   14 +
 conf/plugins/tnc-imv.opt                           |    5 +
 conf/plugins/tnc-pdp.conf                          |   41 +
 conf/plugins/tnc-pdp.opt                           |   24 +
 conf/plugins/tnccs-11.conf                         |   11 +
 conf/plugins/tnccs-11.opt                          |    2 +
 conf/plugins/tnccs-20.conf                         |   14 +
 conf/plugins/tnccs-20.opt                          |    5 +
 conf/plugins/unbound.conf                          |   17 +
 conf/plugins/unbound.opt                           |   17 +
 conf/plugins/updown.conf                           |   12 +
 conf/plugins/updown.opt                            |    7 +
 conf/plugins/whitelist.conf                        |   14 +
 conf/plugins/whitelist.opt                         |    6 +
 conf/plugins/xauth-eap.conf                        |   11 +
 conf/plugins/xauth-eap.opt                         |    2 +
 conf/plugins/xauth-pam.conf                        |   18 +
 conf/plugins/xauth-pam.opt                         |    9 +
 conf/strongswan.conf                               |   14 +
 conf/strongswan.conf.5.head.in                     |  127 ++
 conf/strongswan.conf.5.main                        | 1664 ++++++++++++++++
 conf/strongswan.conf.5.tail.in                     |  470 +++++
 config.h.in                                        |   17 +-
 configure                                          |  548 ++++--
 configure.ac                                       |  102 +-
 debian/NEWS                                        |   54 +-
 debian/changelog                                   |   40 +
 debian/control                                     |    2 +-
 debian/ipsec.secrets.proto                         |    4 +-
 debian/libcharon-extra-plugins.install             |   31 +-
 debian/libstrongswan-extra-plugins.install         |   19 +-
 debian/libstrongswan-standard-plugins.install      |    9 +-
 debian/libstrongswan.install                       |   57 +-
 debian/patches/01_fix-manpages.patch               |   15 -
 debian/patches/02_include-strongswan.conf.d.patch  |   10 -
 ...Fix-filtered-enumerator-tests-on-64-bit-b.patch |   77 +
 .../03_unit-tests-Fix-chunk-clear-armel.patch      |   19 +
 debian/patches/series                              |    3 +-
 debian/rules                                       |   57 +-
 debian/strongswan-charon.install                   |    4 +
 debian/strongswan-libcharon.install                |    2 +
 debian/strongswan-starter.install                  |    8 +
 debian/strongswan-starter.postrm                   |    1 +
 init/Makefile.in                                   |   12 +-
 init/systemd/Makefile.in                           |   12 +-
 man/Makefile.am                                    |    3 +-
 man/Makefile.in                                    |   22 +-
 man/ipsec.conf.5.in                                |    4 +-
 man/strongswan.conf.5.in                           | 1745 -----------------
 scripts/Makefile.in                                |   12 +-
 scripts/aes-test.c                                 |    4 +-
 scripts/crypt_burn.c                               |    2 +-
 scripts/dh_speed.c                                 |    2 +-
 scripts/dnssec.c                                   |    2 +-
 scripts/fetch.c                                    |    2 +-
 scripts/hash_burn.c                                |    2 +-
 scripts/key2keyid.c                                |    2 +-
 scripts/keyid2sql.c                                |    2 +-
 scripts/malloc_speed.c                             |    2 +-
 scripts/pubkey_speed.c                             |    2 +-
 scripts/tls_test.c                                 |    2 +-
 src/Makefile.am                                    |   16 +-
 src/Makefile.in                                    |   47 +-
 src/_copyright/Makefile.in                         |   12 +-
 src/_copyright/_copyright.c                        |   14 +-
 src/_updown/Makefile.in                            |   12 +-
 src/_updown/_updown.in                             |   34 +
 src/_updown_espmark/Makefile.in                    |   12 +-
 src/charon-cmd/Makefile.in                         |   12 +-
 src/charon-cmd/charon-cmd.8.in                     |   18 +
 src/charon-cmd/charon-cmd.c                        |    7 +-
 src/charon-cmd/cmd/cmd_connection.c                |   97 +-
 src/charon-cmd/cmd/cmd_options.c                   |    6 +
 src/charon-cmd/cmd/cmd_options.h                   |    3 +
 src/charon-nm/Makefile.in                          |   12 +-
 src/charon-nm/charon-nm.c                          |    6 +-
 src/charon-nm/nm/nm_backend.c                      |   12 -
 src/charon-nm/nm/nm_service.c                      |   16 +-
 src/charon-tkm/Makefile.am                         |   40 +-
 src/charon-tkm/Makefile.in                         |   52 +-
 src/charon-tkm/build_common.gpr                    |    2 +-
 src/charon-tkm/build_tests.gpr                     |    6 +-
 src/charon-tkm/src/charon-tkm.c                    |   17 +-
 src/charon-tkm/src/tkm/tkm.c                       |    4 +-
 src/charon-tkm/src/tkm/tkm_diffie_hellman.c        |  108 +-
 src/charon-tkm/src/tkm/tkm_diffie_hellman.h        |   13 +
 src/charon-tkm/src/tkm/tkm_id_manager.c            |    1 -
 src/charon-tkm/tests/chunk_map_tests.c             |   17 +-
 src/charon-tkm/tests/diffie_hellman_tests.c        |   18 +-
 src/charon-tkm/tests/id_manager_tests.c            |   20 +-
 src/charon-tkm/tests/kernel_sad_tests.c            |   23 +-
 src/charon-tkm/tests/keymat_tests.c                |   18 +-
 src/charon-tkm/tests/nonceg_tests.c                |   21 +-
 src/charon-tkm/tests/test_runner.c                 |   84 -
 src/charon-tkm/tests/test_runner.h                 |   30 -
 src/charon-tkm/tests/tests.c                       |  114 ++
 src/charon-tkm/tests/tests.h                       |   23 +
 src/charon-tkm/tests/utils_tests.c                 |   15 +-
 src/charon/Android.mk                              |    1 -
 src/charon/Makefile.in                             |   12 +-
 src/charon/charon.c                                |    6 +-
 src/checksum/Makefile.am                           |   19 +-
 src/checksum/Makefile.in                           |   79 +-
 src/checksum/checksum_builder.c                    |    5 +-
 src/conftest/Makefile.in                           |   12 +-
 src/conftest/conftest.c                            |    8 +-
 src/dumm/Makefile.in                               |   12 +-
 src/dumm/cowfs.h                                   |    2 +-
 src/dumm/ext/dumm.c                                |    2 +-
 src/dumm/main.c                                    |    2 +-
 src/include/Makefile.in                            |   12 +-
 src/ipsec/Makefile.in                              |   12 +-
 src/ipsec/_ipsec.8                                 |    2 +-
 src/libcharon/Android.mk                           |    1 -
 src/libcharon/Makefile.in                          |   12 +-
 src/libcharon/config/ike_cfg.c                     |    6 +-
 src/libcharon/config/proposal.c                    |    4 +
 src/libcharon/daemon.c                             |   36 +-
 src/libcharon/daemon.h                             |   10 +-
 src/libcharon/encoding/payloads/notify_payload.c   |   14 +-
 src/libcharon/encoding/payloads/notify_payload.h   |    2 +
 src/libcharon/network/receiver.c                   |   20 +-
 src/libcharon/network/sender.c                     |    8 +-
 src/libcharon/plugins/addrblock/Makefile.in        |   12 +-
 src/libcharon/plugins/android_dns/Makefile.in      |   12 +-
 src/libcharon/plugins/android_log/Makefile.in      |   12 +-
 .../plugins/android_log/android_log_logger.c       |    2 +-
 src/libcharon/plugins/certexpire/Makefile.in       |   12 +-
 .../plugins/certexpire/certexpire_export.c         |   30 +-
 src/libcharon/plugins/coupling/Makefile.in         |   12 +-
 .../plugins/coupling/coupling_validator.c          |    8 +-
 src/libcharon/plugins/dhcp/Makefile.in             |   12 +-
 src/libcharon/plugins/dhcp/dhcp_socket.c           |   40 +-
 src/libcharon/plugins/dnscert/Makefile.in          |   12 +-
 src/libcharon/plugins/dnscert/dnscert_plugin.c     |    2 +-
 src/libcharon/plugins/duplicheck/Makefile.in       |   12 +-
 .../plugins/duplicheck/duplicheck_notify.c         |    2 +-
 .../plugins/duplicheck/duplicheck_plugin.c         |    2 +-
 src/libcharon/plugins/eap_aka/Makefile.in          |   12 +-
 src/libcharon/plugins/eap_aka/eap_aka_server.c     |    2 +-
 src/libcharon/plugins/eap_aka_3gpp2/Makefile.in    |   12 +-
 .../plugins/eap_aka_3gpp2/eap_aka_3gpp2_card.c     |    2 +-
 src/libcharon/plugins/eap_dynamic/Makefile.in      |   12 +-
 src/libcharon/plugins/eap_dynamic/eap_dynamic.c    |    4 +-
 src/libcharon/plugins/eap_gtc/Makefile.in          |   12 +-
 src/libcharon/plugins/eap_gtc/eap_gtc.c            |    2 +-
 src/libcharon/plugins/eap_identity/Makefile.in     |   12 +-
 src/libcharon/plugins/eap_md5/Makefile.in          |   12 +-
 src/libcharon/plugins/eap_mschapv2/Makefile.in     |   12 +-
 src/libcharon/plugins/eap_peap/Makefile.in         |   12 +-
 src/libcharon/plugins/eap_peap/eap_peap.c          |    8 +-
 src/libcharon/plugins/eap_peap/eap_peap_server.c   |    8 +-
 src/libcharon/plugins/eap_radius/Makefile.in       |   12 +-
 src/libcharon/plugins/eap_radius/eap_radius.c      |   10 +-
 .../plugins/eap_radius/eap_radius_accounting.c     |    6 +-
 src/libcharon/plugins/eap_radius/eap_radius_dae.c  |   10 +-
 .../plugins/eap_radius/eap_radius_forward.c        |    4 +-
 .../plugins/eap_radius/eap_radius_plugin.c         |   34 +-
 .../plugins/eap_radius/eap_radius_xauth.c          |    2 +-
 src/libcharon/plugins/eap_sim/Makefile.in          |   12 +-
 src/libcharon/plugins/eap_sim/eap_sim_server.c     |    2 +-
 src/libcharon/plugins/eap_sim_file/Makefile.in     |   12 +-
 src/libcharon/plugins/eap_sim_pcsc/Makefile.in     |   12 +-
 .../plugins/eap_simaka_pseudonym/Makefile.in       |   12 +-
 .../plugins/eap_simaka_reauth/Makefile.in          |   12 +-
 src/libcharon/plugins/eap_simaka_sql/Makefile.in   |   12 +-
 .../plugins/eap_simaka_sql/eap_simaka_sql_plugin.c |    4 +-
 src/libcharon/plugins/eap_tls/Makefile.in          |   12 +-
 src/libcharon/plugins/eap_tls/eap_tls.c            |    6 +-
 src/libcharon/plugins/eap_tnc/Makefile.in          |   12 +-
 src/libcharon/plugins/eap_tnc/eap_tnc.c            |    6 +-
 src/libcharon/plugins/eap_ttls/Makefile.in         |   12 +-
 src/libcharon/plugins/eap_ttls/eap_ttls.c          |    8 +-
 src/libcharon/plugins/eap_ttls/eap_ttls_server.c   |    8 +-
 src/libcharon/plugins/error_notify/Makefile.in     |   12 +-
 .../plugins/error_notify/error_notify_socket.c     |    2 +-
 src/libcharon/plugins/farp/Makefile.in             |   12 +-
 src/libcharon/plugins/ha/Makefile.in               |   12 +-
 src/libcharon/plugins/ha/ha_attribute.c            |    2 +-
 src/libcharon/plugins/ha/ha_plugin.c               |   14 +-
 src/libcharon/plugins/ha/ha_segments.c             |    6 +-
 src/libcharon/plugins/ipseckey/Makefile.in         |   12 +-
 src/libcharon/plugins/ipseckey/ipseckey_plugin.c   |    2 +-
 src/libcharon/plugins/kernel_libipsec/Makefile.in  |   12 +-
 .../kernel_libipsec/kernel_libipsec_ipsec.c        |    2 +-
 .../kernel_libipsec/kernel_libipsec_plugin.c       |    2 +-
 src/libcharon/plugins/led/Makefile.in              |   12 +-
 src/libcharon/plugins/led/led_listener.c           |    6 +-
 src/libcharon/plugins/load_tester/Makefile.in      |   12 +-
 .../plugins/load_tester/load_tester_config.c       |   57 +-
 .../plugins/load_tester/load_tester_control.c      |    2 +-
 .../plugins/load_tester/load_tester_creds.c        |   12 +-
 .../plugins/load_tester/load_tester_listener.c     |    2 +-
 .../plugins/load_tester/load_tester_plugin.c       |   16 +-
 src/libcharon/plugins/lookip/Makefile.in           |   12 +-
 src/libcharon/plugins/lookip/lookip_socket.c       |   39 +-
 src/libcharon/plugins/maemo/Makefile.in            |   12 +-
 src/libcharon/plugins/medcli/Makefile.in           |   12 +-
 src/libcharon/plugins/medsrv/Makefile.in           |   12 +-
 src/libcharon/plugins/osx_attr/Makefile.in         |   12 +-
 src/libcharon/plugins/radattr/Makefile.in          |   12 +-
 src/libcharon/plugins/radattr/radattr_listener.c   |   52 +-
 src/libcharon/plugins/smp/Makefile.in              |   12 +-
 src/libcharon/plugins/socket_default/Makefile.in   |   12 +-
 .../plugins/socket_default/socket_default_socket.c |   14 +-
 src/libcharon/plugins/socket_dynamic/Makefile.in   |   12 +-
 .../plugins/socket_dynamic/socket_dynamic_socket.c |    2 +-
 src/libcharon/plugins/sql/Makefile.in              |   12 +-
 src/libcharon/plugins/sql/sql_logger.c             |    2 +-
 src/libcharon/plugins/sql/sql_plugin.c             |    2 +-
 src/libcharon/plugins/stroke/Makefile.in           |   12 +-
 src/libcharon/plugins/stroke/stroke_config.c       |    2 +-
 src/libcharon/plugins/stroke/stroke_control.c      |    2 +-
 src/libcharon/plugins/stroke/stroke_cred.c         |   53 +-
 src/libcharon/plugins/stroke/stroke_socket.c       |   53 +-
 src/libcharon/plugins/systime_fix/Makefile.in      |   12 +-
 .../plugins/systime_fix/systime_fix_plugin.c       |    8 +-
 src/libcharon/plugins/tnc_ifmap/Makefile.in        |   12 +-
 .../plugins/tnc_ifmap/tnc_ifmap_listener.c         |    4 +-
 src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c   |   14 +-
 src/libcharon/plugins/tnc_pdp/Makefile.in          |   12 +-
 src/libcharon/plugins/tnc_pdp/tnc_pdp.c            |   14 +-
 .../plugins/tnc_pdp/tnc_pdp_connections.c          |    2 +-
 src/libcharon/plugins/uci/Makefile.in              |   12 +-
 src/libcharon/plugins/unit_tester/Makefile.in      |   12 +-
 src/libcharon/plugins/unity/Makefile.in            |   12 +-
 src/libcharon/plugins/unity/unity_narrow.c         |   11 +-
 src/libcharon/plugins/unity/unity_provider.c       |   77 +-
 src/libcharon/plugins/updown/Makefile.in           |   12 +-
 src/libcharon/plugins/updown/updown_handler.c      |    2 +-
 src/libcharon/plugins/updown/updown_listener.c     |   10 +-
 src/libcharon/plugins/updown/updown_plugin.c       |    2 +-
 src/libcharon/plugins/whitelist/Makefile.in        |   12 +-
 .../plugins/whitelist/whitelist_control.c          |    2 +-
 .../plugins/whitelist/whitelist_listener.c         |    2 +-
 src/libcharon/plugins/xauth_eap/Makefile.in        |   12 +-
 src/libcharon/plugins/xauth_eap/xauth_eap.c        |    2 +-
 src/libcharon/plugins/xauth_generic/Makefile.in    |   12 +-
 src/libcharon/plugins/xauth_noauth/Makefile.in     |   12 +-
 src/libcharon/plugins/xauth_pam/Makefile.am        |    1 +
 src/libcharon/plugins/xauth_pam/Makefile.in        |   16 +-
 src/libcharon/plugins/xauth_pam/xauth_pam.c        |   13 +-
 .../plugins/xauth_pam/xauth_pam_listener.c         |  144 ++
 .../plugins/xauth_pam/xauth_pam_listener.h         |   58 +
 src/libcharon/plugins/xauth_pam/xauth_pam_plugin.c |   71 +-
 src/libcharon/processing/jobs/inactivity_job.c     |    5 +-
 src/libcharon/sa/child_sa.c                        |   13 +
 src/libcharon/sa/child_sa.h                        |    7 +
 src/libcharon/sa/ike_sa.c                          |   41 +-
 src/libcharon/sa/ike_sa_manager.c                  |    8 +-
 src/libcharon/sa/ikev1/task_manager_v1.c           |   19 +-
 src/libcharon/sa/ikev1/tasks/aggressive_mode.c     |    6 +-
 src/libcharon/sa/ikev1/tasks/isakmp_vendor.c       |    4 +-
 src/libcharon/sa/ikev1/tasks/quick_mode.c          |    2 +-
 src/libcharon/sa/ikev2/keymat_v2.c                 |   30 +-
 src/libcharon/sa/ikev2/task_manager_v2.c           |   15 +-
 src/libcharon/sa/ikev2/tasks/child_create.c        |    4 +-
 src/libcharon/sa/ikev2/tasks/ike_auth.c            |    2 +-
 src/libcharon/sa/ikev2/tasks/ike_cert_pre.c        |    2 +-
 src/libcharon/sa/ikev2/tasks/ike_vendor.c          |   79 +-
 src/libcharon/sa/task_manager.h                    |    5 +
 src/libcharon/sa/trap_manager.c                    |   87 +-
 src/libcharon/sa/xauth/xauth_manager.c             |    3 +
 src/libfast/Makefile.in                            |   12 +-
 src/libfast/fast_request.c                         |   39 +-
 src/libhydra/Android.mk                            |    1 -
 src/libhydra/Makefile.in                           |   12 +-
 src/libhydra/attributes/mem_pool.c                 |    2 +-
 src/libhydra/hydra.c                               |    4 +-
 src/libhydra/hydra.h                               |   12 +-
 src/libhydra/kernel/kernel_interface.c             |    4 +-
 src/libhydra/plugins/attr/Makefile.in              |   12 +-
 src/libhydra/plugins/attr/attr_provider.c          |    8 +-
 src/libhydra/plugins/attr_sql/Makefile.in          |   12 +-
 src/libhydra/plugins/attr_sql/attr_sql_plugin.c    |    4 +-
 src/libhydra/plugins/attr_sql/sql_attribute.c      |    2 +-
 src/libhydra/plugins/kernel_klips/Makefile.in      |   12 +-
 .../plugins/kernel_klips/kernel_klips_ipsec.c      |   10 +-
 src/libhydra/plugins/kernel_netlink/Makefile.in    |   12 +-
 .../plugins/kernel_netlink/kernel_netlink_ipsec.c  |   22 +-
 .../plugins/kernel_netlink/kernel_netlink_net.c    |   25 +-
 src/libhydra/plugins/kernel_pfkey/Makefile.in      |   12 +-
 .../plugins/kernel_pfkey/kernel_pfkey_ipsec.c      |    4 +-
 src/libhydra/plugins/kernel_pfroute/Makefile.in    |   12 +-
 .../plugins/kernel_pfroute/kernel_pfroute_net.c    |   11 +-
 src/libhydra/plugins/resolve/Makefile.in           |   12 +-
 src/libhydra/plugins/resolve/resolve_handler.c     |    4 +-
 src/libimcv/Makefile.am                            |    4 +-
 src/libimcv/Makefile.in                            |   65 +-
 src/libimcv/imcv.c                                 |   11 +-
 src/libimcv/imv/data.sql                           |  132 ++
 src/libimcv/imv/imv_msg.c                          |    4 +-
 src/libimcv/imv/imv_policy_manager.c               |   11 +-
 src/libimcv/imv/imv_reason_string.c                |   11 +-
 src/libimcv/imv/imv_reason_string.h                |    3 +-
 src/libimcv/imv/imv_workitem.c                     |    5 +-
 src/libimcv/imv/imv_workitem.h                     |    3 +-
 src/libimcv/ita/ita_attr_command.c                 |    5 +-
 src/libimcv/ita/ita_attr_get_settings.c            |    9 +-
 src/libimcv/ita/ita_attr_settings.c                |    9 +-
 src/libimcv/os_info/os_info.c                      |    4 +-
 src/libimcv/plugins/imc_os/Makefile.in             |   12 +-
 src/libimcv/plugins/imc_os/imc_os.c                |    2 +-
 src/libimcv/plugins/imc_scanner/Makefile.in        |   12 +-
 src/libimcv/plugins/imc_scanner/imc_scanner.c      |    2 +-
 src/libimcv/plugins/imc_test/Makefile.in           |   12 +-
 src/libimcv/plugins/imc_test/imc_test.c            |   12 +-
 src/libimcv/plugins/imv_os/Makefile.in             |   12 +-
 src/libimcv/plugins/imv_os/imv_os_database.c       |    5 +-
 src/libimcv/plugins/imv_os/imv_os_state.c          |    4 +-
 src/libimcv/plugins/imv_os/pacman.c                |    4 +-
 src/libimcv/plugins/imv_os/pacman.sh               |    1 +
 src/libimcv/plugins/imv_scanner/Makefile.in        |   12 +-
 .../plugins/imv_scanner/imv_scanner_state.c        |    4 +-
 src/libimcv/plugins/imv_test/Makefile.in           |   12 +-
 src/libimcv/plugins/imv_test/imv_test_agent.c      |   10 +-
 src/libimcv/plugins/imv_test/imv_test_state.c      |    2 +-
 src/libipsec/Android.mk                            |    1 -
 src/libipsec/Makefile.in                           |   12 +-
 src/libpts/Makefile.in                             |   12 +-
 src/libpts/plugins/imc_attestation/Makefile.in     |   12 +-
 .../imc_attestation/imc_attestation_process.c      |   11 +-
 src/libpts/plugins/imc_swid/Makefile.in            |   12 +-
 src/libpts/plugins/imc_swid/imc_swid.c             |    4 +-
 src/libpts/plugins/imv_attestation/Makefile.in     |   12 +-
 src/libpts/plugins/imv_attestation/attest.c        |   13 +-
 src/libpts/plugins/imv_attestation/attest_db.c     |    4 +-
 src/libpts/plugins/imv_attestation/attest_usage.c  |    7 +-
 .../imv_attestation/imv_attestation_agent.c        |  186 +-
 .../imv_attestation/imv_attestation_build.c        |  153 +-
 .../imv_attestation/imv_attestation_build.h        |    5 +-
 .../imv_attestation/imv_attestation_process.c      |   83 +-
 .../imv_attestation/imv_attestation_state.c        |  114 +-
 .../imv_attestation/imv_attestation_state.h        |   35 +-
 src/libpts/plugins/imv_swid/Makefile.in            |   12 +-
 src/libpts/pts/components/ita/ita_comp_ima.c       |    8 +-
 src/libpts/pts/components/ita/ita_comp_tboot.c     |   12 +-
 src/libpts/pts/pts.c                               |    8 +-
 src/libpts/pts/pts_database.c                      |   62 +-
 src/libpts/pts/pts_file_meas.c                     |    3 +-
 src/libpts/swid/swid_inventory.c                   |   34 +-
 src/libpts/tcg/pts/tcg_pts_attr_req_file_meas.c    |    5 +-
 src/libpts/tcg/pts/tcg_pts_attr_req_file_meta.c    |    5 +-
 .../tcg/pts/tcg_pts_attr_req_func_comp_evid.c      |    2 +-
 src/libpts/tcg/pts/tcg_pts_attr_unix_file_meta.c   |    5 +-
 src/libpttls/Makefile.in                           |   12 +-
 src/libradius/Makefile.in                          |   12 +-
 src/libsimaka/Makefile.in                          |   12 +-
 src/libstrongswan/Android.mk                       |    8 +-
 src/libstrongswan/Makefile.am                      |   17 +-
 src/libstrongswan/Makefile.in                      |   73 +-
 src/libstrongswan/asn1/asn1.c                      |   80 +-
 src/libstrongswan/asn1/asn1.h                      |    7 +
 src/libstrongswan/asn1/asn1_parser.c               |    1 +
 src/libstrongswan/asn1/oid.c                       |  650 ++++---
 src/libstrongswan/asn1/oid.h                       |  328 ++--
 src/libstrongswan/asn1/oid.txt                     |   24 +
 src/libstrongswan/collections/array.c              |  151 +-
 src/libstrongswan/collections/array.h              |   73 +-
 src/libstrongswan/credentials/credential_manager.c |    2 +-
 src/libstrongswan/crypto/crypto_factory.c          |    6 +-
 src/libstrongswan/crypto/crypto_tester.c           |    8 +-
 src/libstrongswan/crypto/diffie_hellman.c          |    9 +-
 src/libstrongswan/crypto/diffie_hellman.h          |    5 +
 .../crypto/proposal/proposal_keywords.c            |   55 +-
 .../crypto/proposal/proposal_keywords.h            |   13 +
 .../crypto/proposal/proposal_keywords_static.c     |  324 ++--
 .../crypto/proposal/proposal_keywords_static.txt   |    8 +-
 src/libstrongswan/fetcher/fetcher_manager.c        |    2 +-
 src/libstrongswan/library.c                        |   49 +-
 src/libstrongswan/library.h                        |   16 +-
 src/libstrongswan/networking/host_resolver.c       |    8 +-
 src/libstrongswan/networking/streams/stream.c      |   17 +-
 src/libstrongswan/networking/streams/stream.h      |    5 +-
 src/libstrongswan/networking/tun_device.c          |    8 +-
 src/libstrongswan/networking/tun_device.h          |    1 -
 src/libstrongswan/plugins/aes/Makefile.in          |   12 +-
 src/libstrongswan/plugins/af_alg/Makefile.in       |   12 +-
 src/libstrongswan/plugins/agent/Makefile.in        |   12 +-
 src/libstrongswan/plugins/agent/agent_plugin.c     |    8 +-
 .../plugins/agent/agent_private_key.c              |    1 -
 src/libstrongswan/plugins/blowfish/Makefile.in     |   12 +-
 src/libstrongswan/plugins/ccm/Makefile.in          |   12 +-
 src/libstrongswan/plugins/cmac/Makefile.in         |   12 +-
 src/libstrongswan/plugins/constraints/Makefile.in  |   12 +-
 src/libstrongswan/plugins/ctr/Makefile.in          |   12 +-
 src/libstrongswan/plugins/curl/Makefile.in         |   12 +-
 src/libstrongswan/plugins/curl/curl_fetcher.c      |   17 +-
 src/libstrongswan/plugins/des/Makefile.in          |   12 +-
 src/libstrongswan/plugins/dnskey/Makefile.in       |   12 +-
 src/libstrongswan/plugins/fips_prf/Makefile.in     |   12 +-
 src/libstrongswan/plugins/gcm/Makefile.in          |   12 +-
 src/libstrongswan/plugins/gcrypt/Makefile.in       |   12 +-
 src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c   |    4 +-
 src/libstrongswan/plugins/gmp/Makefile.in          |   12 +-
 src/libstrongswan/plugins/hmac/Makefile.in         |   12 +-
 src/libstrongswan/plugins/keychain/Makefile.in     |   12 +-
 src/libstrongswan/plugins/ldap/Makefile.in         |   12 +-
 src/libstrongswan/plugins/md4/Makefile.in          |   12 +-
 src/libstrongswan/plugins/md5/Makefile.in          |   12 +-
 src/libstrongswan/plugins/mysql/Makefile.in        |   12 +-
 src/libstrongswan/plugins/nonce/Makefile.in        |   12 +-
 src/libstrongswan/plugins/ntru/Makefile.am         |   33 +
 src/libstrongswan/plugins/ntru/Makefile.in         |  812 ++++++++
 .../plugins/ntru/ntru_crypto/ntru_crypto.h         |  235 +++
 .../ntru/ntru_crypto/ntru_crypto_ntru_convert.c    |  581 ++++++
 .../ntru/ntru_crypto/ntru_crypto_ntru_convert.h    |  183 ++
 .../ntru/ntru_crypto/ntru_crypto_ntru_encrypt.c    | 1034 ++++++++++
 .../ntru_crypto/ntru_crypto_ntru_encrypt_key.c     |  360 ++++
 .../ntru_crypto/ntru_crypto_ntru_encrypt_key.h     |  167 ++
 .../ntru_crypto_ntru_encrypt_param_sets.c          |  384 ++++
 .../ntru_crypto_ntru_encrypt_param_sets.h          |  101 +
 .../ntru/ntru_crypto/ntru_crypto_ntru_poly.c       |  242 +++
 .../ntru/ntru_crypto/ntru_crypto_ntru_poly.h       |   96 +
 src/libstrongswan/plugins/ntru/ntru_drbg.c         |  279 +++
 src/libstrongswan/plugins/ntru/ntru_drbg.h         |   77 +
 src/libstrongswan/plugins/ntru/ntru_ke.c           |  396 ++++
 src/libstrongswan/plugins/ntru/ntru_ke.h           |   50 +
 src/libstrongswan/plugins/ntru/ntru_mgf1.c         |  182 ++
 src/libstrongswan/plugins/ntru/ntru_mgf1.h         |   77 +
 src/libstrongswan/plugins/ntru/ntru_plugin.c       |   83 +
 src/libstrongswan/plugins/ntru/ntru_plugin.h       |   42 +
 src/libstrongswan/plugins/ntru/ntru_poly.c         |  416 ++++
 src/libstrongswan/plugins/ntru/ntru_poly.h         |   99 +
 src/libstrongswan/plugins/ntru/ntru_trits.c        |  133 ++
 src/libstrongswan/plugins/ntru/ntru_trits.h        |   61 +
 src/libstrongswan/plugins/openssl/Makefile.in      |   12 +-
 src/libstrongswan/plugins/openssl/openssl_crl.c    |    2 +-
 .../plugins/openssl/openssl_ec_diffie_hellman.c    |    7 +-
 src/libstrongswan/plugins/openssl/openssl_plugin.c |    2 +-
 .../plugins/openssl/openssl_rsa_private_key.c      |    2 +-
 src/libstrongswan/plugins/openssl/openssl_x509.c   |    2 +-
 src/libstrongswan/plugins/padlock/Makefile.in      |   12 +-
 src/libstrongswan/plugins/pem/Makefile.in          |   12 +-
 src/libstrongswan/plugins/pem/pem_builder.c        |   35 +-
 src/libstrongswan/plugins/pgp/Makefile.in          |   12 +-
 src/libstrongswan/plugins/pkcs1/Makefile.in        |   12 +-
 src/libstrongswan/plugins/pkcs11/Makefile.in       |   12 +-
 src/libstrongswan/plugins/pkcs11/pkcs11_dh.c       |    2 +-
 src/libstrongswan/plugins/pkcs11/pkcs11_manager.c  |    8 +-
 src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c   |   18 +-
 src/libstrongswan/plugins/pkcs12/Makefile.in       |   12 +-
 src/libstrongswan/plugins/pkcs7/Makefile.in        |   12 +-
 src/libstrongswan/plugins/pkcs8/Makefile.in        |   12 +-
 src/libstrongswan/plugins/plugin_loader.c          |  158 +-
 src/libstrongswan/plugins/plugin_loader.h          |   18 +-
 src/libstrongswan/plugins/pubkey/Makefile.in       |   12 +-
 src/libstrongswan/plugins/random/Makefile.in       |   12 +-
 src/libstrongswan/plugins/random/random_plugin.c   |   17 +-
 src/libstrongswan/plugins/random/random_plugin.h   |    5 +
 src/libstrongswan/plugins/random/random_rng.c      |    4 +
 src/libstrongswan/plugins/rc2/Makefile.in          |   12 +-
 src/libstrongswan/plugins/rdrand/Makefile.in       |   12 +-
 src/libstrongswan/plugins/rdrand/rdrand_plugin.c   |   16 +-
 src/libstrongswan/plugins/revocation/Makefile.in   |   12 +-
 src/libstrongswan/plugins/sha1/Makefile.in         |   12 +-
 src/libstrongswan/plugins/sha2/Makefile.in         |   12 +-
 src/libstrongswan/plugins/soup/Makefile.in         |   12 +-
 src/libstrongswan/plugins/sqlite/Makefile.in       |   12 +-
 src/libstrongswan/plugins/sshkey/Makefile.in       |   12 +-
 src/libstrongswan/plugins/sshkey/sshkey_builder.c  |    1 +
 src/libstrongswan/plugins/test_vectors/Makefile.in |   12 +-
 src/libstrongswan/plugins/unbound/Makefile.in      |   12 +-
 .../plugins/unbound/unbound_resolver.c             |   12 +-
 src/libstrongswan/plugins/x509/Makefile.in         |   12 +-
 src/libstrongswan/plugins/x509/x509_cert.c         |    6 +-
 src/libstrongswan/plugins/x509/x509_crl.c          |    2 +-
 src/libstrongswan/plugins/xcbc/Makefile.in         |   12 +-
 src/libstrongswan/processing/processor.c           |    2 +-
 src/libstrongswan/processing/watcher.c             |    2 +-
 src/libstrongswan/tests/Makefile.am                |   67 +-
 src/libstrongswan/tests/Makefile.in                | 1302 +++++++------
 src/libstrongswan/tests/suites/test_array.c        |  532 +++++
 src/libstrongswan/tests/suites/test_asn1.c         |  869 +++++++++
 src/libstrongswan/tests/suites/test_asn1_parser.c  |  291 +++
 src/libstrongswan/tests/suites/test_bio_reader.c   |  450 +++++
 src/libstrongswan/tests/suites/test_bio_writer.c   |  392 ++++
 src/libstrongswan/tests/suites/test_chunk.c        | 1027 ++++++++++
 src/libstrongswan/tests/suites/test_crypter.c      |  107 +
 src/libstrongswan/tests/suites/test_ecdsa.c        |  243 +++
 src/libstrongswan/tests/{ => suites}/test_enum.c   |    0
 .../tests/{ => suites}/test_enumerator.c           |    0
 src/libstrongswan/tests/suites/test_fetch_http.c   |  273 +++
 src/libstrongswan/tests/suites/test_hasher.c       |  189 ++
 .../tests/{ => suites}/test_hashtable.c            |    0
 src/libstrongswan/tests/{ => suites}/test_host.c   |    0
 .../tests/suites/test_identification.c             |  857 ++++++++
 src/libstrongswan/tests/suites/test_linked_list.c  |  390 ++++
 .../{ => suites}/test_linked_list_enumerator.c     |    0
 src/libstrongswan/tests/suites/test_ntru.c         | 1042 ++++++++++
 src/libstrongswan/tests/suites/test_pen.c          |   87 +
 src/libstrongswan/tests/suites/test_printf.c       |  228 +++
 src/libstrongswan/tests/suites/test_rsa.c          |  399 ++++
 src/libstrongswan/tests/suites/test_settings.c     |  920 +++++++++
 src/libstrongswan/tests/suites/test_stream.c       |  267 +++
 src/libstrongswan/tests/suites/test_test_rng.c     |   56 +
 src/libstrongswan/tests/suites/test_threading.c    | 1466 ++++++++++++++
 src/libstrongswan/tests/suites/test_utils.c        |  743 +++++++
 src/libstrongswan/tests/suites/test_vectors.c      |   42 +
 src/libstrongswan/tests/suites/test_watcher.c      |  214 ++
 src/libstrongswan/tests/test_array.c               |  360 ----
 src/libstrongswan/tests/test_bio_reader.c          |  450 -----
 src/libstrongswan/tests/test_bio_writer.c          |  392 ----
 src/libstrongswan/tests/test_chunk.c               |  876 ---------
 src/libstrongswan/tests/test_ecdsa.c               |  237 ---
 src/libstrongswan/tests/test_identification.c      |  857 --------
 src/libstrongswan/tests/test_linked_list.c         |  386 ----
 src/libstrongswan/tests/test_printf.c              |  185 --
 src/libstrongswan/tests/test_rsa.c                 |  393 ----
 src/libstrongswan/tests/test_runner.c              |  500 ++++-
 src/libstrongswan/tests/test_runner.h              |   84 +-
 src/libstrongswan/tests/test_suite.c               |  277 +++
 src/libstrongswan/tests/test_suite.h               |  350 +++-
 src/libstrongswan/tests/test_threading.c           |  110 --
 src/libstrongswan/tests/test_utils.c               |  556 ------
 src/libstrongswan/tests/test_vectors.c             |   41 -
 src/libstrongswan/tests/tests.c                    |   56 +
 src/libstrongswan/tests/tests.h                    |   43 +
 src/libstrongswan/tests/utils/test_rng.c           |   86 +
 src/libstrongswan/tests/utils/test_rng.h           |   36 +
 src/libstrongswan/threading/thread.h               |    9 +-
 src/libstrongswan/utils/backtrace.c                |    4 +-
 src/libstrongswan/utils/backtrace.h                |    4 +-
 src/libstrongswan/utils/capabilities.h             |    3 +
 src/libstrongswan/utils/chunk.c                    |  193 +-
 src/libstrongswan/utils/chunk.h                    |   44 +-
 src/libstrongswan/utils/identification.c           |    7 +-
 src/libstrongswan/utils/integrity_checker.c        |   37 +-
 src/libstrongswan/utils/leak_detective.c           |  112 +-
 src/libstrongswan/utils/leak_detective.h           |   52 +-
 .../utils/printf_hook/printf_hook_builtin.c        |   16 +-
 .../utils/printf_hook/printf_hook_glibc.c          |    2 +-
 src/libstrongswan/utils/settings.c                 |  486 +++--
 src/libstrongswan/utils/settings.h                 |   25 +
 src/libstrongswan/utils/test.c                     |   50 +
 src/libstrongswan/utils/test.h                     |   96 +
 src/libstrongswan/utils/utils.c                    |  220 ++-
 src/libstrongswan/utils/utils.h                    |   70 +-
 src/libstrongswan/utils/utils/strerror.c           |   97 +
 src/libstrongswan/utils/utils/strerror.h           |   40 +
 src/libtls/Makefile.in                             |   12 +-
 src/libtls/tls.c                                   |    1 +
 src/libtls/tls_crypto.c                            |   12 +-
 src/libtnccs/Android.mk                            |    1 -
 src/libtnccs/Makefile.in                           |   12 +-
 src/libtnccs/plugins/tnc_imc/Makefile.in           |   12 +-
 src/libtnccs/plugins/tnc_imc/tnc_imc.c             |    2 +-
 src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c     |    2 +-
 src/libtnccs/plugins/tnc_imv/Makefile.in           |   12 +-
 src/libtnccs/plugins/tnc_imv/tnc_imv.c             |    2 +-
 src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c     |    4 +-
 src/libtnccs/plugins/tnc_tnccs/Makefile.in         |   12 +-
 src/libtnccs/plugins/tnccs_11/Makefile.in          |   12 +-
 src/libtnccs/plugins/tnccs_11/tnccs_11.c           |    2 +-
 src/libtnccs/plugins/tnccs_20/Makefile.in          |   12 +-
 src/libtnccs/plugins/tnccs_20/tnccs_20.c           |    4 +-
 src/libtnccs/plugins/tnccs_dynamic/Makefile.in     |   12 +-
 src/libtnccs/tnc/tnc.c                             |   44 +-
 src/libtncif/Android.mk                            |    1 -
 src/libtncif/Makefile.in                           |   12 +-
 src/manager/Makefile.in                            |   12 +-
 src/manager/main.c                                 |    2 +-
 src/medsrv/Makefile.in                             |   12 +-
 src/medsrv/main.c                                  |    2 +-
 src/openac/Makefile.in                             |   12 +-
 src/openac/openac.c                                |   12 +-
 src/pki/Makefile.in                                |   12 +-
 src/pki/command.c                                  |   27 +-
 src/pki/command.h                                  |    6 +-
 src/pki/commands/issue.c                           |   16 +-
 src/pki/commands/keyid.c                           |    9 +-
 src/pki/commands/print.c                           |    7 +-
 src/pki/commands/pub.c                             |    9 +-
 src/pki/commands/req.c                             |    8 +-
 src/pki/commands/self.c                            |    8 +-
 src/pki/commands/verify.c                          |    8 +-
 src/pki/man/Makefile.in                            |   12 +-
 src/pki/man/pki---issue.1.in                       |    2 +-
 src/pki/pki.c                                      |    2 +-
 src/pool/Makefile.am                               |    7 +
 src/pool/Makefile.in                               |  128 +-
 src/pool/mysql.sql                                 |  281 +++
 src/pool/pool.c                                    |   13 +-
 src/pool/sqlite.sql                                |  283 +++
 src/pt-tls-client/Makefile.in                      |   12 +-
 src/pt-tls-client/pt-tls-client.c                  |    2 +-
 src/scepclient/Makefile.in                         |   12 +-
 src/scepclient/scepclient.c                        |   39 +-
 src/starter/Android.mk                             |    1 -
 src/starter/Makefile.in                            |   12 +-
 src/starter/starter.c                              |    4 +-
 src/stroke/Android.mk                              |    1 -
 src/stroke/Makefile.in                             |   12 +-
 src/stroke/stroke.c                                |    2 +-
 src/strongswan.conf                                |   34 -
 test-driver                                        |  127 --
 testing/Makefile.am                                |    2 +-
 testing/Makefile.in                                |   14 +-
 testing/config/kernel/config-3.12                  | 2022 +++++++++++++++++++
 testing/config/kernel/config-3.13                  | 2047 ++++++++++++++++++++
 testing/hosts/default/etc/ipsec.d/tables.sql       |  270 ---
 testing/hosts/default/etc/pts/data.sql             | 1060 ----------
 testing/hosts/default/etc/pts/tables.sql           |  256 ---
 testing/scripts/build-baseimage                    |    2 +-
 testing/scripts/build-guestkernel                  |    2 +-
 testing/scripts/recipes/003_freeradius.mk          |    2 +-
 testing/scripts/recipes/010_tkm.mk                 |    2 +-
 testing/scripts/recipes/013_strongswan.mk          |    4 +-
 testing/ssh                                        |   37 +
 testing/testing.conf                               |   10 +-
 testing/tests/ikev1/ip-pool-db/pretest.dat         |    4 +-
 .../tests/ikev1/net2net-ntru-cert/description.txt  |    7 +
 testing/tests/ikev1/net2net-ntru-cert/evaltest.dat |    9 +
 .../net2net-ntru-cert/hosts/moon/etc/ipsec.conf    |   25 +
 .../hosts/moon/etc/strongswan.conf                 |   15 +
 .../net2net-ntru-cert/hosts/sun/etc/ipsec.conf     |   25 +
 .../hosts/sun/etc/strongswan.conf                  |    7 +
 testing/tests/ikev1/net2net-ntru-cert/posttest.dat |    5 +
 testing/tests/ikev1/net2net-ntru-cert/pretest.dat  |    6 +
 testing/tests/ikev1/net2net-ntru-cert/test.conf    |   21 +
 testing/tests/ikev1/rw-ntru-psk/description.txt    |   13 +
 testing/tests/ikev1/rw-ntru-psk/evaltest.dat       |   22 +
 .../ikev1/rw-ntru-psk/hosts/carol/etc/ipsec.conf   |   23 +
 .../rw-ntru-psk/hosts/carol/etc/ipsec.secrets      |    3 +
 .../rw-ntru-psk/hosts/carol/etc/strongswan.conf    |    6 +
 .../ikev1/rw-ntru-psk/hosts/dave/etc/ipsec.conf    |   23 +
 .../ikev1/rw-ntru-psk/hosts/dave/etc/ipsec.secrets |    3 +
 .../rw-ntru-psk/hosts/dave/etc/strongswan.conf     |    6 +
 .../ikev1/rw-ntru-psk/hosts/moon/etc/ipsec.conf    |   32 +
 .../ikev1/rw-ntru-psk/hosts/moon/etc/ipsec.secrets |    5 +
 .../rw-ntru-psk/hosts/moon/etc/strongswan.conf     |    6 +
 testing/tests/ikev1/rw-ntru-psk/posttest.dat       |    6 +
 testing/tests/ikev1/rw-ntru-psk/pretest.dat        |   13 +
 testing/tests/ikev1/rw-ntru-psk/test.conf          |   21 +
 testing/tests/ikev2/compress-nat/description.txt   |    3 +
 testing/tests/ikev2/compress-nat/evaltest.dat      |   22 +
 .../ikev2/compress-nat/hosts/alice/etc/ipsec.conf  |   24 +
 .../compress-nat/hosts/alice/etc/strongswan.conf   |    5 +
 .../ikev2/compress-nat/hosts/bob/etc/ipsec.conf    |   24 +
 .../compress-nat/hosts/bob/etc/strongswan.conf     |    5 +
 .../ikev2/compress-nat/hosts/carol/etc/ipsec.conf  |   23 +
 .../compress-nat/hosts/carol/etc/iptables.rules    |   24 +
 .../compress-nat/hosts/carol/etc/strongswan.conf   |    5 +
 testing/tests/ikev2/compress-nat/posttest.dat      |   10 +
 testing/tests/ikev2/compress-nat/pretest.dat       |   21 +
 testing/tests/ikev2/compress-nat/test.conf         |   21 +
 testing/tests/ikev2/compress/description.txt       |    7 +-
 testing/tests/ikev2/compress/evaltest.dat          |    4 +-
 .../ikev2/compress/hosts/carol/etc/ipsec.conf      |    1 +
 .../ikev2/compress/hosts/carol/etc/strongswan.conf |    2 +-
 .../tests/ikev2/compress/hosts/moon/etc/ipsec.conf |    1 +
 .../ikev2/compress/hosts/moon/etc/strongswan.conf  |    2 +-
 testing/tests/ikev2/compress/posttest.dat          |    2 +
 testing/tests/ikev2/compress/pretest.dat           |    2 +
 .../ikev2/host2host-transport-nat/description.txt  |   13 +
 .../ikev2/host2host-transport-nat/evaltest.dat     |   12 +
 .../hosts/alice/etc/ipsec.conf                     |   18 +
 .../hosts/sun/etc/ipsec.conf                       |   18 +
 .../hosts/sun/etc/iptables.rules                   |   28 +
 .../hosts/venus/etc/ipsec.conf                     |   18 +
 .../ikev2/host2host-transport-nat/posttest.dat     |    6 +
 .../ikev2/host2host-transport-nat/pretest.dat      |   12 +
 .../tests/ikev2/host2host-transport-nat/test.conf  |   21 +
 testing/tests/ikev2/ip-pool-db/pretest.dat         |    4 +-
 testing/tests/ikev2/ip-split-pools-db/pretest.dat  |    4 +-
 testing/tests/ikev2/ip-two-pools-db/pretest.dat    |    6 +-
 testing/tests/ikev2/ip-two-pools-mixed/pretest.dat |    4 +-
 .../tests/ikev2/ip-two-pools-v4v6-db/pretest.dat   |    4 +-
 testing/tests/ikev2/lookip/description.txt         |   13 +
 testing/tests/ikev2/lookip/evaltest.dat            |   22 +
 .../tests/ikev2/lookip/hosts/carol/etc/ipsec.conf  |   21 +
 .../ikev2/lookip/hosts/carol/etc/strongswan.conf   |    5 +
 .../tests/ikev2/lookip/hosts/dave/etc/ipsec.conf   |   21 +
 .../ikev2/lookip/hosts/dave/etc/strongswan.conf    |    5 +
 .../tests/ikev2/lookip/hosts/moon/etc/ipsec.conf   |   20 +
 .../ikev2/lookip/hosts/moon/etc/strongswan.conf    |    5 +
 testing/tests/ikev2/lookip/posttest.dat            |    6 +
 testing/tests/ikev2/lookip/pretest.dat             |   10 +
 testing/tests/ikev2/lookip/test.conf               |   21 +
 .../tests/ikev2/net2net-ntru-cert/description.txt  |    7 +
 testing/tests/ikev2/net2net-ntru-cert/evaltest.dat |    9 +
 .../net2net-ntru-cert/hosts/moon/etc/ipsec.conf    |   25 +
 .../hosts/moon/etc/strongswan.conf                 |   15 +
 .../net2net-ntru-cert/hosts/sun/etc/ipsec.conf     |   25 +
 .../hosts/sun/etc/strongswan.conf                  |    7 +
 testing/tests/ikev2/net2net-ntru-cert/posttest.dat |    5 +
 testing/tests/ikev2/net2net-ntru-cert/pretest.dat  |    6 +
 testing/tests/ikev2/net2net-ntru-cert/test.conf    |   21 +
 testing/tests/ikev2/rw-ntru-psk/description.txt    |   13 +
 testing/tests/ikev2/rw-ntru-psk/evaltest.dat       |   22 +
 .../ikev2/rw-ntru-psk/hosts/carol/etc/ipsec.conf   |   23 +
 .../rw-ntru-psk/hosts/carol/etc/ipsec.secrets      |    3 +
 .../rw-ntru-psk/hosts/carol/etc/strongswan.conf    |    6 +
 .../ikev2/rw-ntru-psk/hosts/dave/etc/ipsec.conf    |   23 +
 .../ikev2/rw-ntru-psk/hosts/dave/etc/ipsec.secrets |    3 +
 .../rw-ntru-psk/hosts/dave/etc/strongswan.conf     |    6 +
 .../ikev2/rw-ntru-psk/hosts/moon/etc/ipsec.conf    |   22 +
 .../ikev2/rw-ntru-psk/hosts/moon/etc/ipsec.secrets |    5 +
 .../rw-ntru-psk/hosts/moon/etc/strongswan.conf     |    6 +
 testing/tests/ikev2/rw-ntru-psk/posttest.dat       |    6 +
 testing/tests/ikev2/rw-ntru-psk/pretest.dat        |   13 +
 testing/tests/ikev2/rw-ntru-psk/test.conf          |   21 +
 .../tests/ipv6/rw-compress-ikev2/description.txt   |   10 +
 testing/tests/ipv6/rw-compress-ikev2/evaltest.dat  |   13 +
 .../rw-compress-ikev2/hosts/carol/etc/ipsec.conf   |   25 +
 .../hosts/carol/etc/strongswan.conf                |    5 +
 .../rw-compress-ikev2/hosts/moon/etc/ipsec.conf    |   24 +
 .../hosts/moon/etc/strongswan.conf                 |    5 +
 testing/tests/ipv6/rw-compress-ikev2/posttest.dat  |    8 +
 testing/tests/ipv6/rw-compress-ikev2/pretest.dat   |   13 +
 testing/tests/ipv6/rw-compress-ikev2/test.conf     |   22 +
 testing/tests/sql/ip-pool-db-expired/pretest.dat   |    6 +-
 testing/tests/sql/ip-pool-db-restart/pretest.dat   |    6 +-
 testing/tests/sql/ip-pool-db/pretest.dat           |    6 +-
 .../sql/ip-split-pools-db-restart/pretest.dat      |    6 +-
 testing/tests/sql/ip-split-pools-db/pretest.dat    |    6 +-
 testing/tests/sql/multi-level-ca/pretest.dat       |    6 +-
 testing/tests/sql/net2net-cert/pretest.dat         |    6 +-
 testing/tests/sql/net2net-psk/pretest.dat          |    6 +-
 testing/tests/sql/net2net-route-pem/pretest.dat    |    4 +-
 testing/tests/sql/net2net-start-pem/pretest.dat    |    4 +-
 testing/tests/sql/rw-cert/pretest.dat              |    6 +-
 testing/tests/sql/rw-eap-aka-rsa/pretest.dat       |    4 +-
 testing/tests/sql/rw-psk-ipv4/pretest.dat          |    6 +-
 testing/tests/sql/rw-psk-ipv6/pretest.dat          |    6 +-
 testing/tests/sql/rw-psk-rsa-split/pretest.dat     |    6 +-
 testing/tests/sql/rw-rsa-keyid/pretest.dat         |    6 +-
 testing/tests/sql/rw-rsa/pretest.dat               |    6 +-
 testing/tests/sql/shunt-policies/pretest.dat       |    6 +-
 .../hosts/moon/etc/strongswan.conf                 |    8 +
 .../hosts/moon/etc/strongswan.conf                 |    8 +
 .../hosts/moon/etc/strongswan.conf                 |    8 +
 .../multiple-clients/hosts/sun/etc/strongswan.conf |    8 +
 .../hosts/moon/etc/strongswan.conf                 |    8 +
 .../hosts/moon/etc/strongswan.conf                 |    8 +
 testing/tests/tnc/tnccs-11-radius-pts/pretest.dat  |    2 +-
 testing/tests/tnc/tnccs-20-os/pretest.dat          |    6 +-
 testing/tests/tnc/tnccs-20-pt-tls/pretest.dat      |    2 +-
 testing/tests/tnc/tnccs-20-pts/pretest.dat         |    6 +-
 875 files changed, 40040 insertions(+), 12358 deletions(-)

diff --cc debian/changelog
index d118946,2f81431..470b939
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,43 +1,49 @@@
+ strongswan (5.1.2-3) unstable; urgency=medium
+ 
+   * debian/patches/
+     - 02_unit-tests-Fix-filtered-enumerator-tests-on-64-bit-b  added, fix
+     testsuite failing on 64 bit big-endian platforms (s390x).
+     - 03_unit-tests-Fix-chunk-clear-armel added, fix testsuite failing on
+     armel.
+ 
+  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 02 Apr 2014 21:20:33 +0200
+ 
+ strongswan (5.1.2-2) unstable; urgency=medium
+ 
+   * debian/rules:
+     - use reduced keylengths in testsuite on various arches, hopefully fixing
+       FTBFS when the genrsa test runs.
+ 
+  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 25 Mar 2014 12:09:49 +0100
+ 
+ strongswan (5.1.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/control:
+     - add conflicts against openSwan.                           closes: #740808
+   * debian/strongswan-starter,postrm:
+     - remove /var/lib/strongswan on purge.
+   * debian/ipsec.secrets.proto:
+     - stop lying about ipsec showhostkey command.               closes: #600382
+   * debian/patches:
+     - 01_fix-manpages refreshed for new upstream.
+     - 02_include-strongswan.conf.d removed, strongswan.d is now supported
+       upstream.
+   * debian/rules, debian/*.install:
+     - install default configuration files for all plugins.
+   * debian/NEWS:
+     - fix spurious entry.
+     - add a NEWS entry to advertise about the new strongswan.d configuration
+       mechanism. 
+ 
+  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Mar 2014 11:22:38 +0100
+ 
 +strongswan (5.1.1-3~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Romain Francoise <rfrancoise at debian.org>  Mon, 10 Mar 2014 19:37:40 +0100
 +
  strongswan (5.1.1-3) unstable; urgency=low
  
    * Upload to unstable.

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