On Mon, 2025-08-25 at 10:51 +0200, Chris Hofstaedtler wrote: > > I'd like to push a new strongSwan version to Trixie first point release > > following a bug report found after the release: #1109942. > > > the debdiff is attached. > > The debdiff appears to be missing.
Yes, sorry #brownpaperbag. I've sent a followup email but just in case here it is. -- Yves-Alexis
Differences in strongswan between 6.0.1-6 and 6.0.1-6+deb13u1 diff -Nru strongswan-6.0.1/debian/changelog strongswan-6.0.1/debian/changelog --- strongswan-6.0.1/debian/changelog 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/changelog 2025-08-22 09:58:42.000000000 +0200 @@ -1,3 +1,9 @@ +strongswan (6.0.1-6+deb13u1) trixie; urgency=medium + + * d/patches: add patches to fix OpenSSL 3.5.1 support (Closes: #1109942) + + -- Yves-Alexis Perez <[email protected]> Fri, 22 Aug 2025 09:58:42 +0200 + strongswan (6.0.1-6) unstable; urgency=medium * d/control: keep strongswan-charon and strongswan-starter as acceptable diff -Nru strongswan-6.0.1/debian/gbp.conf strongswan-6.0.1/debian/gbp.conf --- strongswan-6.0.1/debian/gbp.conf 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/gbp.conf 2025-08-22 09:58:42.000000000 +0200 @@ -1,4 +1,4 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = debian/trixie upstream-branch = upstream/latest diff -Nru strongswan-6.0.1/debian/patches/0001-openssl-Fix-testing-KDF_PRF-in-the-constructor-with-.patch strongswan-6.0.1/debian/patches/0001-openssl-Fix-testing-KDF_PRF-in-the-constructor-with-.patch --- strongswan-6.0.1/debian/patches/0001-openssl-Fix-testing-KDF_PRF-in-the-constructor-with-.patch 1970-01-01 01:00:00.000000000 +0100 +++ strongswan-6.0.1/debian/patches/0001-openssl-Fix-testing-KDF_PRF-in-the-constructor-with-.patch 2025-08-22 09:58:42.000000000 +0200 @@ -0,0 +1,36 @@ +From 2dbeecfc029ba26647c756b0882bc6e85e2e6b64 Mon Sep 17 00:00:00 2001 +From: Tobias Brunner <[email protected]> +Date: Thu, 10 Jul 2025 18:11:19 +0200 +Subject: [PATCH] openssl: Fix testing KDF_PRF in the constructor with OpenSSL + 3.5.1 + +Setting the salt to NULL now fails, so we set it to hash length's zeroes, +which is the default value for HKDF-Extract if no salt is passed. + +Fixes strongswan/strongswan#2828 +--- + src/libstrongswan/plugins/openssl/openssl_kdf.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/libstrongswan/plugins/openssl/openssl_kdf.c b/src/libstrongswan/plugins/openssl/openssl_kdf.c +index cca81783ab..e1b67c920d 100644 +--- a/src/libstrongswan/plugins/openssl/openssl_kdf.c ++++ b/src/libstrongswan/plugins/openssl/openssl_kdf.c +@@ -201,6 +201,14 @@ kdf_t *openssl_kdf_create(key_derivation_function_t algo, va_list args) + .key = chunk_clone(chunk_from_str("00000000000000000000000000000000")), + ); + ++ /* also generate a salt (as if none was provided, i.e. zeroes of hash length) ++ * as OpenSSL 3.5.1+ won't accept NULL anymore */ ++ if (algo == KDF_PRF) ++ { ++ this->salt = chunk_copy_pad(chunk_alloc(get_length(this)), ++ chunk_empty, 0); ++ } ++ + if (!this->hasher || + !get_bytes(this, algo == KDF_PRF ? get_length(this) : sizeof(buf), buf)) + { +-- +2.50.1 + diff -Nru strongswan-6.0.1/debian/patches/0002-openssl-Don-t-allocate-salt-if-PRF-hash-is-unknown.patch strongswan-6.0.1/debian/patches/0002-openssl-Don-t-allocate-salt-if-PRF-hash-is-unknown.patch --- strongswan-6.0.1/debian/patches/0002-openssl-Don-t-allocate-salt-if-PRF-hash-is-unknown.patch 1970-01-01 01:00:00.000000000 +0100 +++ strongswan-6.0.1/debian/patches/0002-openssl-Don-t-allocate-salt-if-PRF-hash-is-unknown.patch 2025-08-22 09:58:42.000000000 +0200 @@ -0,0 +1,28 @@ +From 43b805b2daed48bdf835ca8eeb87b9b71a42781f Mon Sep 17 00:00:00 2001 +From: Tobias Brunner <[email protected]> +Date: Fri, 11 Jul 2025 11:42:47 +0200 +Subject: [PATCH] openssl: Don't allocate salt if PRF/hash is unknown + +This can happen if e.g. AES-XCBC is selected. + +Fixes: 2dbeecfc029b ("openssl: Fix testing KDF_PRF in the constructor with OpenSSL 3.5.1") +--- + src/libstrongswan/plugins/openssl/openssl_kdf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libstrongswan/plugins/openssl/openssl_kdf.c b/src/libstrongswan/plugins/openssl/openssl_kdf.c +index e1b67c920d..4611a38824 100644 +--- a/src/libstrongswan/plugins/openssl/openssl_kdf.c ++++ b/src/libstrongswan/plugins/openssl/openssl_kdf.c +@@ -203,7 +203,7 @@ kdf_t *openssl_kdf_create(key_derivation_function_t algo, va_list args) + + /* also generate a salt (as if none was provided, i.e. zeroes of hash length) + * as OpenSSL 3.5.1+ won't accept NULL anymore */ +- if (algo == KDF_PRF) ++ if (algo == KDF_PRF && this->hasher) + { + this->salt = chunk_copy_pad(chunk_alloc(get_length(this)), + chunk_empty, 0); +-- +2.50.1 + diff -Nru strongswan-6.0.1/debian/patches/series strongswan-6.0.1/debian/patches/series --- strongswan-6.0.1/debian/patches/series 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/patches/series 2025-08-22 09:58:42.000000000 +0200 @@ -2,3 +2,5 @@ 03_systemd-service.patch 04_disable-libtls-tests.patch dont-load-kernel-libipsec-plugin-by-default.patch +0001-openssl-Fix-testing-KDF_PRF-in-the-constructor-with-.patch +0002-openssl-Don-t-allocate-salt-if-PRF-hash-is-unknown.patch diff -Nru strongswan-6.0.1/debian/po/ca.po strongswan-6.0.1/debian/po/ca.po --- strongswan-6.0.1/debian/po/ca.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/ca.po 2025-08-22 09:58:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2025-01-30 07:33+0100\n" "Last-Translator: poc senderi <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/cs.po strongswan-6.0.1/debian/po/cs.po --- strongswan-6.0.1/debian/po/cs.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/cs.po 2025-08-22 09:58:42.000000000 +0200 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-10-28 14:42+0100\n" "Last-Translator: Miroslav Kure <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/da.po strongswan-6.0.1/debian/po/da.po --- strongswan-6.0.1/debian/po/da.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/da.po 2025-08-22 09:58:42.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-10-06 12:42+0000\n" "Last-Translator: Joe Hansen <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/de.po strongswan-6.0.1/debian/po/de.po --- strongswan-6.0.1/debian/po/de.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/de.po 2025-08-22 09:58:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: strongswan 4.4.0-1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-11-02 15:40+0100\n" "Last-Translator: Helge Kreutzmann <[email protected]>\n" "Language-Team: German <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/es.po strongswan-6.0.1/debian/po/es.po --- strongswan-6.0.1/debian/po/es.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/es.po 2025-08-22 09:58:42.000000000 +0200 @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: strongswan 4.4.1-5\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-12-17 17:19-0300\n" "Last-Translator: Matías Bellone <[email protected]>\n" "Language-Team: Debian l10n Spanish <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/eu.po strongswan-6.0.1/debian/po/eu.po --- strongswan-6.0.1/debian/po/eu.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/eu.po 2025-08-22 09:58:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: strongswan_4.4.1-5.1_eu\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-10-15 21:41+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/fi.po strongswan-6.0.1/debian/po/fi.po --- strongswan-6.0.1/debian/po/fi.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/fi.po 2025-08-22 09:58:42.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2009-05-25 14:49+0100\n" "Last-Translator: Esko Arajärvi <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/fr.po strongswan-6.0.1/debian/po/fr.po --- strongswan-6.0.1/debian/po/fr.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/fr.po 2025-08-22 09:58:42.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2010-06-24 22:17+0200\n" "Last-Translator: Christian Perrier <[email protected]>\n" "Language-Team: French <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/gl.po strongswan-6.0.1/debian/po/gl.po --- strongswan-6.0.1/debian/po/gl.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/gl.po 2025-08-22 09:58:42.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: templates_[kI6655]\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2009-05-25 14:50+0100\n" "Last-Translator: marce villarino <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/it.po strongswan-6.0.1/debian/po/it.po --- strongswan-6.0.1/debian/po/it.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/it.po 2025-08-22 09:58:42.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-11-09 13:41+0200\n" "Last-Translator: Beatrice Torracca <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/ja.po strongswan-6.0.1/debian/po/ja.po --- strongswan-6.0.1/debian/po/ja.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/ja.po 2025-08-22 09:58:42.000000000 +0200 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: strongswan 4.4.1-4\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-02-07 21:28+0900\n" "Last-Translator: Hideki Yamane <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/nb.po strongswan-6.0.1/debian/po/nb.po --- strongswan-6.0.1/debian/po/nb.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/nb.po 2025-08-22 09:58:42.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-10-06 17:37+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/nl.po strongswan-6.0.1/debian/po/nl.po --- strongswan-6.0.1/debian/po/nl.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/nl.po 2025-08-22 09:58:42.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: strongswan 4.5.0-1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2014-09-24 18:39+0200\n" "Last-Translator: Frans Spiesschaert <[email protected]>\n" "Language-Team: Debian Dutch l10n Team <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/pl.po strongswan-6.0.1/debian/po/pl.po --- strongswan-6.0.1/debian/po/pl.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/pl.po 2025-08-22 09:58:42.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2012-01-31 15:36+0100\n" "Last-Translator: Michał Kułach <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/pt_BR.po strongswan-6.0.1/debian/po/pt_BR.po --- strongswan-6.0.1/debian/po/pt_BR.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/pt_BR.po 2025-08-22 09:58:42.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: strongswan 5.1.3-4\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2014-06-25 18:13-0300\n" "Last-Translator: Adriano Rafael Gomes <[email protected]>\n" "Language-Team: Brazilian Portuguese <debian-l10n-" diff -Nru strongswan-6.0.1/debian/po/pt.po strongswan-6.0.1/debian/po/pt.po --- strongswan-6.0.1/debian/po/pt.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/pt.po 2025-08-22 09:58:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: strongswan 5.1.0-3\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-11-18 00:33+0000\n" "Last-Translator: Américo Monteiro <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/ru.po strongswan-6.0.1/debian/po/ru.po --- strongswan-6.0.1/debian/po/ru.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/ru.po 2025-08-22 09:58:42.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: strongswan 5.1.0-1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-10-07 19:08+0400\n" "Last-Translator: Yuri Kozlov <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/sv.po strongswan-6.0.1/debian/po/sv.po --- strongswan-6.0.1/debian/po/sv.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/sv.po 2025-08-22 09:58:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: strongswan_sv\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-10-07 09:05+0100\n" "Last-Translator: Martin Bagge / brother <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/templates.pot strongswan-6.0.1/debian/po/templates.pot --- strongswan-6.0.1/debian/po/templates.pot 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/templates.pot 2025-08-22 09:58:42.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/tr.po strongswan-6.0.1/debian/po/tr.po --- strongswan-6.0.1/debian/po/tr.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/tr.po 2025-08-22 09:58:42.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: strongswan\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2013-10-24 11:17+0200\n" "Last-Translator: Atila KOÇ <[email protected]>\n" "Language-Team: Türkçe <[email protected]>\n" diff -Nru strongswan-6.0.1/debian/po/vi.po strongswan-6.0.1/debian/po/vi.po --- strongswan-6.0.1/debian/po/vi.po 2025-07-22 18:24:43.000000000 +0200 +++ strongswan-6.0.1/debian/po/vi.po 2025-08-22 09:58:42.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: strongswan 4.4.0-1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-07-22 18:25+0200\n" +"POT-Creation-Date: 2025-08-22 10:01+0200\n" "PO-Revision-Date: 2010-10-03 19:22+1030\n" "Last-Translator: Clytie Siddall <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n"
signature.asc
Description: This is a digitally signed message part
