From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 633C5139368 for ; Mon, 9 Aug 2021 05:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84830E0822; Mon, 9 Aug 2021 05:57:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60F42E0822 for ; Mon, 9 Aug 2021 05:57:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1B85342B04 for ; Mon, 9 Aug 2021 05:57:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A3337AF for ; Mon, 9 Aug 2021 05:57:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1628488404.8f0d0d52ade4ea790c82353e37999153ab6126d2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/qca/Manifest app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch app-crypt/qca/qca-2.3.2.ebuild X-VCS-Directories: app-crypt/qca/ app-crypt/qca/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8f0d0d52ade4ea790c82353e37999153ab6126d2 X-VCS-Branch: master Date: Mon, 9 Aug 2021 05:57:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c130aefa-d861-494d-b7db-3d071c5973a7 X-Archives-Hash: b51f37b0ebf49d8bd4a8eb63cbc6fd05 commit: 8f0d0d52ade4ea790c82353e37999153ab6126d2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 9 05:53:24 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 9 05:53:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0d0d52 app-crypt/qca: Drop 2.3.2 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/Manifest | 1 - ...signverify_message_invalid-fails-randomly.patch | 32 -------- ...3.2-openssl-1.1.1i-empty-msg-verification.patch | 57 -------------- app-crypt/qca/qca-2.3.2.ebuild | 88 ---------------------- 4 files changed, 178 deletions(-) diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index d4d9f7558a0..ad17e4e1880 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,2 +1 @@ -DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4 DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6 diff --git a/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch b/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch deleted file mode 100644 index af86e4539fb..00000000000 --- a/app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ecdd0538dded7d2ba9e73a51f4f52030dd3f5a3b Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Fri, 5 Feb 2021 17:43:45 +0100 -Subject: [PATCH] Fix CMSut::signverify_message_invalid failing "randomly" - -Once in a blue moon it happens that signedResult1[signedResult1.size() - -2] is a 0, so setting it to 0 doesn't break the signature validation, so - check if it's a 0 and if it is, set it to 1 ---- - unittest/cms/cms.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp -index 4901221e..9b541789 100644 ---- a/unittest/cms/cms.cpp -+++ b/unittest/cms/cms.cpp -@@ -499,7 +499,11 @@ void CMSut::signverify_message_invalid() - - // This is just to break things - // signedResult1[30] = signedResult1[30] + 1; -- signedResult1[signedResult1.size() - 2] = 0x00; -+ if (signedResult1.at(signedResult1.size() - 2) != 0) { -+ signedResult1[signedResult1.size() - 2] = 0x00; -+ } else { -+ signedResult1[signedResult1.size() - 2] = 0x01; -+ } - - msg.startVerify(); - msg.update(signedResult1); --- -GitLab - diff --git a/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch b/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch deleted file mode 100644 index 34258aed162..00000000000 --- a/app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bc94cc08e1d3ea733946861d90a21681d58665ab Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Fri, 5 Feb 2021 16:39:11 +0100 -Subject: [PATCH] openssl 1.1.1i made verification of empty messages always - succeed - -BUGS: 432519 ---- - unittest/cms/cms.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/unittest/cms/cms.cpp b/unittest/cms/cms.cpp -index 37e188d0..4901221e 100644 ---- a/unittest/cms/cms.cpp -+++ b/unittest/cms/cms.cpp -@@ -30,6 +30,8 @@ - #include "import_plugins.h" - #endif - -+#include -+ - class CMSut : public QObject - { - Q_OBJECT -@@ -252,7 +254,9 @@ void CMSut::signverify() - msg.waitForFinished(-1); - QVERIFY(msg.wasSigned()); - QVERIFY(msg.success()); -+#if OPENSSL_VERSION_NUMBER < 0x1010109fL - QEXPECT_FAIL("empty", "We don't seem to be able to verify signature of a zero length message", Continue); -+#endif - QVERIFY(msg.verifySuccess()); - - msg.reset(); -@@ -264,7 +268,9 @@ void CMSut::signverify() - msg.waitForFinished(-1); - QVERIFY(msg.wasSigned()); - QVERIFY(msg.success()); -+#if OPENSSL_VERSION_NUMBER < 0x1010109fL - QEXPECT_FAIL("empty", "We don't seem to be able to verify signature of a zero length message", Continue); -+#endif - QVERIFY(msg.verifySuccess()); - - msg.reset(); -@@ -277,6 +283,9 @@ void CMSut::signverify() - msg.waitForFinished(-1); - QVERIFY(msg.wasSigned()); - QVERIFY(msg.success()); -+#if OPENSSL_VERSION_NUMBER >= 0x1010109fL -+ QEXPECT_FAIL("empty", "On newer openssl verifaction of zero length message always succeeds", Continue); -+#endif - QCOMPARE(msg.verifySuccess(), false); - - msg.reset(); --- -GitLab - diff --git a/app-crypt/qca/qca-2.3.2.ebuild b/app-crypt/qca/qca-2.3.2.ebuild deleted file mode 100644 index 8d66157373c..00000000000 --- a/app-crypt/qca/qca-2.3.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde.org cmake qmake-utils - -DESCRIPTION="Qt Cryptographic Architecture (QCA)" -HOMEPAGE="https://userbase.kde.org/QCA" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="2" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( app-doc/doxygen ) -" -RDEPEND=" - dev-qt/qtcore:5 - botan? ( dev-libs/botan:= ) - gcrypt? ( dev-libs/libgcrypt:= ) - gpg? ( app-crypt/gnupg ) - nss? ( dev-libs/nss ) - pkcs11? ( - >=dev-libs/openssl-1.1 - dev-libs/pkcs11-helper - ) - sasl? ( dev-libs/cyrus-sasl:2 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) -" -DEPEND="${RDEPEND} - test? ( - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-pgp-test.patch" - "${FILESDIR}/${P}-openssl-1.1.1i-empty-msg-verification.patch" # bug 766932 - "${FILESDIR}/${P}-cmsut-signverify_message_invalid-fails-randomly.patch" -) - -qca_plugin_use() { - echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") -} - -src_configure() { - local mycmakeargs=( - -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features" - -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)" - $(qca_plugin_use botan) - $(qca_plugin_use gcrypt) - $(qca_plugin_use gpg gnupg) - $(qca_plugin_use logger) - $(qca_plugin_use nss) - $(qca_plugin_use pkcs11) - $(qca_plugin_use sasl cyrus-sasl) - $(qca_plugin_use softstore) - $(qca_plugin_use ssl ossl) - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" - cmake_src_test -} - -src_install() { - cmake_src_install - - if use doc; then - pushd "${BUILD_DIR}" >/dev/null || die - doxygen Doxyfile || die - dodoc -r apidocs/html - popd >/dev/null || die - fi - - if use examples; then - dodoc -r "${S}"/examples - fi -}