commit: 0dea04942291e82e6df9cdb1c12688a07e59bfed Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Aug 16 15:30:00 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Aug 16 16:03:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dea0494
dev-qt/qtnetwork: drop 5.15.10-r2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...etwork-5.15.10-ssl-upgr-default-DH-params.patch | 101 --------------------- dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild | 64 ------------- 2 files changed, 165 deletions(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch deleted file mode 100644 index 94f1325070d5..000000000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 05406c3f5f516d3148254c8294e8883c28a2c95a Mon Sep 17 00:00:00 2001 -From: Giuseppe D'Angelo <[email protected]> -Date: Wed, 21 Jun 2023 13:30:35 +0200 -Subject: [PATCH] SSL: upgrade the default DH parameters - -We have been using as default DH parameters the 1024-bit MODP group. -This is now considered insecure, and applications should use the -2048-bit at a minimum [1]. This commit therefore replaces the parameters -with the 2048-bit MODP group from [2]. - -To double check the data, use openssl asn1parse to verify that the prime -matches. For instance: - -1) put the encoded string in a `encoded.txt` file (c&p from the source, - removing the double quotes) -2) put the hexadecimal value of the 2048-bit group in a `reference.txt` - file (c&p from [2]) -3) compare the output of openssl asn1parse with the reference. For - instance like this: - - $ diff <(openssl asn1parse < encoded.txt | grep -m 1 INTEGER | perl -pe 's/.*://; s/\n//') <(perl -0777 -pe 's/\s//g' reference.txt) && echo OK - OK - -[1] https://datatracker.ietf.org/doc/html/rfc8247#section-2.4 -[2] https://datatracker.ietf.org/doc/html/rfc3526#section-3 - -[ChangeLog][QtNetwork][QSslDiffieHellmanParameters] The default -Diffie-Hellman parameters are now using the 2048-bit MODP group from -RFC 3526. - -Pick-to: 6.6 6.5 6.2 5.15 -Change-Id: I47133cd78ba0e954b8f93a3da09fa2c760c9f7a8 -Reviewed-by: Timur Pocheptsov <[email protected]> -(cherry picked from commit 3ec24e329c9ef6802786a37f30ddd8982e903480) ---- - src/network/ssl/qsslconfiguration.cpp | 12 ++++++++++-- - src/network/ssl/qssldiffiehellmanparameters.cpp | 13 +++++++------ - 2 files changed, 17 insertions(+), 8 deletions(-) - -diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp -index f5ce02807f..84a9187334 100644 ---- a/src/network/ssl/qsslconfiguration.cpp -+++ b/src/network/ssl/qsslconfiguration.cpp -@@ -929,7 +929,11 @@ void QSslConfiguration::setPreSharedKeyIdentityHint(const QByteArray &hint) - Retrieves the current set of Diffie-Hellman parameters. - - If no Diffie-Hellman parameters have been set, the QSslConfiguration object -- defaults to using the 1024-bit MODP group from RFC 2409. -+ defaults to using the 2048-bit MODP group from RFC 3526. -+ -+ \note The default parameters may change in future Qt versions. -+ Please check the documentation of the \e{exact Qt version} that you -+ are using in order to know what defaults that version uses. - */ - QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const - { -@@ -943,7 +947,11 @@ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const - a server to \a dhparams. - - If no Diffie-Hellman parameters have been set, the QSslConfiguration object -- defaults to using the 1024-bit MODP group from RFC 2409. -+ defaults to using the 2048-bit MODP group from RFC 3526. -+ -+ \note The default parameters may change in future Qt versions. -+ Please check the documentation of the \e{exact Qt version} that you -+ are using in order to know what defaults that version uses. - */ - void QSslConfiguration::setDiffieHellmanParameters(const QSslDiffieHellmanParameters &dhparams) - { -diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp -index 7807afaa30..7c2505a0be 100644 ---- a/src/network/ssl/qssldiffiehellmanparameters.cpp -+++ b/src/network/ssl/qssldiffiehellmanparameters.cpp -@@ -68,17 +68,18 @@ - - QT_BEGIN_NAMESPACE - --// The 1024-bit MODP group from RFC 2459 (Second Oakley Group) -+// The 2048-bit MODP group from RFC 3526 - Q_AUTOTEST_EXPORT const char *qssl_dhparams_default_base64 = -- "MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR" -- "Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL" -- "/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC"; -+ "MIIBCAKCAQEA///////////JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxObIlFKCHmO" -+ "NATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjftawv/XLb0Brft7jhr" -+ "+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXTmmkWP6j9JM9fg2VdI9yjrZYc" -+ "YvNWIIVSu57VKQdwlpZtZww1Tkq8mATxdGwIyhghfDKQXkYuNs474553LBgOhgObJ4Oi7Aei" -+ "j7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg=="; - - /*! - Returns the default QSslDiffieHellmanParameters used by QSslSocket. - -- This is currently the 1024-bit MODP group from RFC 2459, also -- known as the Second Oakley Group. -+ This is currently the 2048-bit MODP group from RFC 3526. - */ - QSslDiffieHellmanParameters QSslDiffieHellmanParameters::defaultParameters() - { --- -2.41.0 - diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild deleted file mode 100644 index af527a8bcd60..000000000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="gssapi libproxy sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/network - src/plugins/bearer/generic -) - -QT5_GENTOO_CONFIG=( - libproxy:libproxy: - ssl::SSL - ssl::OPENSSL - ssl:openssl-linked:LINKED_OPENSSL -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :network -) - -PATCHES=( "${FILESDIR}/${P}-ssl-upgr-default-DH-params.patch" ) - -src_configure() { - local myconf=( - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(qt_use sctp) - $(usev ssl -openssl-linked) - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -}
