merge 5.8.2-1
Bug #1861971 reported by
Christian Ehrhardt
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| strongswan (Ubuntu) |
Fix Released
|
Medium
|
Unassigned | ||
Bug Description
5.8.2-1 has a bunch of nice fixes that would be great to have in 20.04
Furthermore we simplified strongswan a lot, this should be a much less painful merge than in the past cycles.
Related branches
~paelzer/ubuntu/+source/strongswan:merge-5.8.2-focal
- Canonical Server: Pending requested
- Canonical Server packageset reviewers: Pending requested
- git-ubuntu developers: Pending requested
-
Diff: 19944 lines (+12688/-1648) (has conflicts)243 files modifiedAndroid.common.mk (+1/-1)
NEWS (+50/-0)
conf/Makefile.am (+1/-0)
conf/Makefile.in (+1/-0)
conf/format-options.py (+15/-14)
conf/options/charon.conf (+2/-3)
conf/options/charon.opt (+11/-3)
conf/plugins/drbg.conf (+12/-0)
conf/plugins/drbg.opt (+3/-0)
conf/plugins/kernel-netlink.conf (+3/-0)
conf/plugins/kernel-netlink.opt (+10/-0)
conf/plugins/ntru.conf (+0/-4)
conf/plugins/ntru.opt (+0/-4)
conf/strongswan.conf.5.main (+21/-8)
configure (+74/-25)
configure.ac (+28/-22)
debian/README.Debian (+1/-1)
debian/changelog (+34/-0)
debian/control (+5/-2)
debian/libstrongswan.install (+3/-0)
debian/po/cs.po (+1/-1)
debian/po/da.po (+1/-1)
debian/po/de.po (+1/-1)
debian/po/es.po (+1/-1)
debian/po/eu.po (+1/-1)
debian/po/fi.po (+1/-1)
debian/po/fr.po (+1/-1)
debian/po/gl.po (+1/-1)
debian/po/it.po (+1/-1)
debian/po/ja.po (+1/-1)
debian/po/nb.po (+1/-1)
debian/po/nl.po (+1/-1)
debian/po/pl.po (+1/-1)
debian/po/pt.po (+1/-1)
debian/po/pt_BR.po (+1/-1)
debian/po/ru.po (+1/-1)
debian/po/sv.po (+1/-1)
debian/po/templates.pot (+1/-1)
debian/po/tr.po (+1/-1)
debian/po/vi.po (+1/-1)
debian/strongswan-nm.install (+1/-1)
debian/watch (+1/-1)
fuzz/Makefile.am (+4/-1)
fuzz/Makefile.in (+4/-1)
man/ipsec.conf.5.in (+1/-1)
src/charon-nm/Makefile.am (+1/-1)
src/charon-nm/Makefile.in (+1/-1)
src/libcharon/config/child_cfg.c (+10/-67)
src/libcharon/config/child_cfg.h (+2/-5)
src/libcharon/config/ike_cfg.c (+6/-52)
src/libcharon/config/ike_cfg.h (+2/-3)
src/libcharon/daemon.c (+1/-1)
src/libcharon/network/receiver.c (+3/-2)
src/libcharon/plugins/attr/attr_provider.c (+1/-1)
src/libcharon/plugins/farp/farp_listener.c (+44/-9)
src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c (+41/-44)
src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c (+64/-19)
src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c (+66/-1)
src/libcharon/plugins/load_tester/load_tester_config.c (+2/-2)
src/libcharon/plugins/smp/smp.c (+2/-0)
src/libcharon/plugins/stroke/stroke_ca.c (+5/-67)
src/libcharon/plugins/stroke/stroke_ca.h (+0/-7)
src/libcharon/plugins/stroke/stroke_config.c (+0/-4)
src/libcharon/plugins/stroke/stroke_list.c (+9/-0)
src/libcharon/plugins/vici/python/Makefile.am (+1/-1)
src/libcharon/plugins/vici/python/Makefile.in (+1/-1)
src/libcharon/plugins/vici/ruby/Makefile.in (+1/-1)
src/libcharon/plugins/vici/vici_authority.c (+5/-69)
src/libcharon/plugins/vici/vici_authority.h (+0/-7)
src/libcharon/plugins/vici/vici_config.c (+20/-6)
src/libcharon/plugins/vici/vici_query.c (+141/-93)
src/libcharon/sa/child_sa.c (+1/-1)
src/libcharon/sa/ike_sa.c (+1/-1)
src/libcharon/sa/ikev1/tasks/aggressive_mode.c (+9/-7)
src/libcharon/sa/ikev1/tasks/main_mode.c (+17/-10)
src/libcharon/sa/ikev1/tasks/quick_mode.c (+19/-12)
src/libcharon/sa/ikev2/task_manager_v2.c (+65/-17)
src/libcharon/sa/ikev2/tasks/child_create.c (+15/-5)
src/libcharon/sa/ikev2/tasks/ike_cert_post.c (+41/-28)
src/libcharon/sa/ikev2/tasks/ike_delete.c (+39/-0)
src/libcharon/sa/ikev2/tasks/ike_init.c (+12/-8)
src/libimcv/plugins/imc_swima/strongswan.org__strongSwan-5-8-2.swidtag (+2/-2)
src/libstrongswan/Android.mk (+4/-2)
src/libstrongswan/Makefile.am (+14/-4)
src/libstrongswan/Makefile.in (+81/-54)
src/libstrongswan/credentials/auth_cfg.c (+34/-7)
src/libstrongswan/credentials/auth_cfg.h (+2/-0)
src/libstrongswan/credentials/certificates/ocsp_request.h (+8/-0)
src/libstrongswan/credentials/certificates/ocsp_response.h (+8/-0)
src/libstrongswan/crypto/crypters/crypter.c (+4/-3)
src/libstrongswan/crypto/crypters/crypter.h (+1/-0)
src/libstrongswan/crypto/crypto_factory.c (+117/-1)
src/libstrongswan/crypto/crypto_factory.h (+47/-2)
src/libstrongswan/crypto/crypto_tester.c (+143/-0)
src/libstrongswan/crypto/crypto_tester.h (+33/-0)
src/libstrongswan/crypto/drbgs/drbg.c (+28/-0)
src/libstrongswan/crypto/drbgs/drbg.h (+45/-30)
src/libstrongswan/crypto/iv/iv_gen.c (+1/-0)
src/libstrongswan/crypto/prf_plus.c (+47/-40)
src/libstrongswan/crypto/proposal/proposal.c (+86/-56)
src/libstrongswan/crypto/proposal/proposal.h (+68/-47)
src/libstrongswan/crypto/rngs/rng_tester.c (+2/-2)
src/libstrongswan/crypto/rngs/rng_tester.h (+11/-11)
src/libstrongswan/crypto/transform.c (+6/-4)
src/libstrongswan/crypto/transform.h (+1/-0)
src/libstrongswan/plugins/aes/aes_crypter.c (+59/-30)
src/libstrongswan/plugins/aes/aes_plugin.c (+3/-0)
src/libstrongswan/plugins/aesni/Makefile.am (+1/-0)
src/libstrongswan/plugins/aesni/Makefile.in (+4/-2)
src/libstrongswan/plugins/aesni/aesni_ecb.c (+836/-0)
src/libstrongswan/plugins/aesni/aesni_ecb.h (+48/-0)
src/libstrongswan/plugins/aesni/aesni_plugin.c (+5/-0)
src/libstrongswan/plugins/af_alg/af_alg_crypter.c (+6/-0)
src/libstrongswan/plugins/af_alg/af_alg_crypter.h (+1/-1)
src/libstrongswan/plugins/drbg/Makefile.am (+18/-0)
src/libstrongswan/plugins/drbg/Makefile.in (+805/-0)
src/libstrongswan/plugins/drbg/drbg_ctr.c (+361/-0)
src/libstrongswan/plugins/drbg/drbg_ctr.h (+51/-0)
src/libstrongswan/plugins/drbg/drbg_hmac.c (+141/-106)
src/libstrongswan/plugins/drbg/drbg_hmac.h (+51/-0)
src/libstrongswan/plugins/drbg/drbg_plugin.c (+92/-0)
src/libstrongswan/plugins/drbg/drbg_plugin.h (+42/-0)
src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c (+3/-1)
src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c (+3/-0)
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c (+58/-50)
src/libstrongswan/plugins/ntru/Makefile.am (+0/-1)
src/libstrongswan/plugins/ntru/Makefile.in (+2/-4)
src/libstrongswan/plugins/ntru/ntru_ke.c (+9/-8)
src/libstrongswan/plugins/ntru/ntru_private_key.c (+5/-7)
src/libstrongswan/plugins/ntru/ntru_private_key.h (+3/-3)
src/libstrongswan/plugins/ntru/ntru_public_key.c (+4/-6)
src/libstrongswan/plugins/ntru/ntru_public_key.h (+3/-3)
src/libstrongswan/plugins/openssl/openssl_crypter.c (+20/-0)
src/libstrongswan/plugins/openssl/openssl_hmac.c (+6/-0)
src/libstrongswan/plugins/openssl/openssl_plugin.c (+9/-0)
src/libstrongswan/plugins/openssl/openssl_util.c (+2/-2)
src/libstrongswan/plugins/openssl/openssl_util.h (+2/-2)
src/libstrongswan/plugins/pkcs11/pkcs11_library.c (+2/-1)
src/libstrongswan/plugins/plugin_feature.c (+22/-0)
src/libstrongswan/plugins/plugin_feature.h (+7/-0)
src/libstrongswan/plugins/plugin_loader.c (+1/-1)
src/libstrongswan/plugins/revocation/revocation_validator.c (+14/-1)
src/libstrongswan/plugins/sshkey/sshkey_builder.c (+6/-6)
src/libstrongswan/plugins/test_vectors/Makefile.am (+3/-0)
src/libstrongswan/plugins/test_vectors/Makefile.in (+21/-8)
src/libstrongswan/plugins/test_vectors/test_vectors.h (+47/-0)
src/libstrongswan/plugins/test_vectors/test_vectors/aes_ecb.c (+70/-0)
src/libstrongswan/plugins/test_vectors/test_vectors/drbg_ctr.c (+470/-0)
src/libstrongswan/plugins/test_vectors/test_vectors/drbg_hmac.c (+812/-0)
src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c (+16/-0)
src/libstrongswan/plugins/wolfssl/wolfssl_aead.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_common.h (+26/-4)
src/libstrongswan/plugins/wolfssl/wolfssl_crypter.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_diffie_hellman.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_ec_diffie_hellman.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_ec_private_key.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_ed_private_key.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_hasher.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_hmac.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_rng.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_rsa_private_key.c (+2/-0)
src/libstrongswan/plugins/wolfssl/wolfssl_rsa_private_key.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_sha1_prf.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_util.h (+3/-3)
src/libstrongswan/plugins/wolfssl/wolfssl_x_diffie_hellman.h (+3/-3)
src/libstrongswan/plugins/x509/x509_ocsp_request.c (+8/-0)
src/libstrongswan/plugins/x509/x509_ocsp_response.c (+11/-2)
src/libstrongswan/tests/Makefile.am (+3/-3)
src/libstrongswan/tests/Makefile.in (+38/-41)
src/libstrongswan/tests/suites/test_ecdsa.c (+1/-1)
src/libstrongswan/tests/suites/test_enum.c (+0/-6)
src/libstrongswan/tests/suites/test_mgf1.c (+0/-1)
src/libstrongswan/tests/suites/test_ntru.c (+11/-271)
src/libstrongswan/tests/suites/test_prf_plus.c (+161/-0)
src/libstrongswan/tests/suites/test_proposal.c (+144/-10)
src/libstrongswan/tests/suites/test_rng_tester.c (+7/-7)
src/libstrongswan/tests/suites/test_rsa.c (+1/-1)
src/libstrongswan/tests/suites/test_utils.c (+63/-0)
src/libstrongswan/tests/suites/test_vectors.c (+2/-0)
src/libstrongswan/tests/tests.h (+2/-2)
src/libstrongswan/utils/chunk.c (+8/-8)
src/libstrongswan/utils/enum.h (+19/-9)
src/libstrongswan/utils/utils/memory.h (+7/-1)
src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.c (+7/-5)
src/libtnccs/plugins/tnccs_20/messages/ita/pb_mutual_capability_msg.h (+1/-1)
src/libtpmtss/tpm_tss_tss2_names_v2.c (+1/-0)
src/libtpmtss/tpm_tss_tss2_v1.c (+1/-1)
src/libtpmtss/tpm_tss_tss2_v2.c (+1/-1)
src/swanctl/commands/list_conns.c (+4/-0)
src/swanctl/swanctl.conf (+3/-0)
src/swanctl/swanctl.conf.5.main (+26/-3)
src/swanctl/swanctl.opt (+18/-2)
testing/config/kernel/config-5.3 (+2937/-0)
testing/config/kernel/config-5.4 (+2939/-0)
testing/hosts/default/etc/ssh/sshd_config (+1/-0)
testing/hosts/winnetou/etc/strongswan.conf (+1/-1)
testing/scripts/build-certs-chroot (+16/-2)
testing/scripts/recipes/011_botan.mk (+1/-1)
testing/testing.conf (+3/-3)
testing/tests/ikev1/esp-alg-null/description.txt (+1/-1)
testing/tests/ikev1/net2net-ntru-cert/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev1/net2net-ntru-cert/hosts/sun/etc/strongswan.conf (+1/-1)
testing/tests/ikev1/rw-cert/hosts/carol/etc/strongswan.conf (+1/-1)
testing/tests/ikev1/rw-cert/hosts/dave/etc/strongswan.conf (+1/-1)
testing/tests/ikev1/rw-cert/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev1/rw-ntru-psk/hosts/carol/etc/strongswan.conf (+1/-1)
testing/tests/ikev1/rw-ntru-psk/hosts/dave/etc/strongswan.conf (+1/-1)
testing/tests/ikev1/rw-ntru-psk/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/alg-chacha20poly1305/hosts/carol/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/alg-chacha20poly1305/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/esp-alg-null/description.txt (+1/-1)
testing/tests/ikev2/force-udp-encaps/hosts/sun/etc/ipsec.conf (+0/-12)
testing/tests/ikev2/net2net-ntru-bandwidth/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/net2net-ntru-bandwidth/hosts/sun/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/net2net-ntru-cert/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/net2net-ntru-cert/hosts/sun/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-cert/hosts/carol/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-cert/hosts/dave/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-cert/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-ntru-bliss/hosts/carol/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-ntru-bliss/hosts/dave/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-ntru-bliss/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-ntru-psk/hosts/carol/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-ntru-psk/hosts/dave/etc/strongswan.conf (+1/-1)
testing/tests/ikev2/rw-ntru-psk/hosts/moon/etc/strongswan.conf (+1/-1)
testing/tests/route-based/net2net-xfrmi-ike/hosts/sun/etc/updown.py (+1/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/description.txt (+12/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/evaltest.dat (+22/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/hosts/carol/etc/strongswan.conf (+11/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/hosts/carol/etc/swanctl/swanctl.conf (+41/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/hosts/dave/etc/strongswan.conf (+11/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/hosts/dave/etc/swanctl/swanctl.conf (+41/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/hosts/moon/etc/strongswan.conf (+11/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/hosts/moon/etc/swanctl/swanctl.conf (+54/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/posttest.dat (+8/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/pretest.dat (+10/-0)
testing/tests/swanctl/rw-hash-and-url-multi-level/test.conf (+25/-0)
testing/tests/swanctl/rw-ntru-bliss/hosts/carol/etc/strongswan.conf (+1/-1)
testing/tests/swanctl/rw-ntru-bliss/hosts/dave/etc/strongswan.conf (+1/-1)
testing/tests/swanctl/rw-ntru-bliss/hosts/moon/etc/strongswan.conf (+1/-1)
| Changed in strongswan (Ubuntu): | |
| status: | New → In Progress |
| Changed in strongswan (Ubuntu): | |
| importance: | Undecided → Medium |
Revision history for this message
| Launchpad Janitor (janitor) wrote | #1 |
| Changed in strongswan (Ubuntu): | |
| status: | In Progress → Fix Released |
To post a comment you must log in.
This bug was fixed in the package strongswan - 5.8.2-1ubuntu1
---------------
strongswan (5.8.2-1ubuntu1) focal; urgency=medium
* Merge with Debian unstable (LP: #1861971). Remaining changes:
- d/control: Transition from strongswan-tnc-* being in extra packages
to libcharon-
- d/control: Transition from former Ubuntu only libcharon-
to common libcharon-
- d/control: strongswan-starter hard-depends on strongswan-charon,
therefore bump the dependency from Recommends to Depends. At the same
time avoid a circular dependency by dropping
strongswa
binaries can work without the services but not vice versa.
* Added Changes
- d/control: build-depend on libiptc-dev to avoid FTBFS (LP: #1861975)
This is needed due to changes in regard to Debian bug 947176 and 939243
and can later be dropped again.
strongswan (5.8.2-1) unstable; urgency=medium
[ Jean-Michel Vourgère ]
* README.Debian: Fixed typo
[ Yves-Alexis Perez ]
* d/control: replace iptables-dev b-dep by libip{4,6}tc-dev (Closes: #946148)
* d/watch: use uscan special strings
* New upstream version 5.8.2
* d/control: update dh compat level to 12
* strongswan-nm: update path for dbus service file
* install DRBG plugin to libstrongswan
* d/control: add ${misc:Pre-Depends} to strongswan-starter
-- Christian Ehrhardt <email address hidden> Wed, 05 Feb 2020 08:28:30 +0100