From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Aug 2021 07:02:28 +0100 Subject: gentoo resync : 11.08.2021 --- app-crypt/qca/Manifest | 4 - ...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, 181 deletions(-) delete mode 100644 app-crypt/qca/files/qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch delete mode 100644 app-crypt/qca/files/qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch delete mode 100644 app-crypt/qca/qca-2.3.2.ebuild (limited to 'app-crypt/qca') diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index 8ff8e3e0589f..ee2c3f553533 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,8 +1,4 @@ -AUX qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch 1195 BLAKE2B 87f2a73355ccd147db01de639ba9211c3d6169d3fff4f16c52ef4a76e61be47a8769baaa5898265941d3f49bcc9a79579d4150b6d4091aa1414494fcc94bca43 SHA512 65e7925811123da0c886a0a1706f590efce3fe3e969566e3c8446b5fd70498c0603812ae413739d6e7f8c05349af5b2a51af9d72d9b2e28cfcb11980c1cf6704 -AUX qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch 1816 BLAKE2B 80dfcff3a0fc5121cbbe956fe847fb6141a778b0c3e479fefc9c0f26b727bdf7957576f32f38324ac5c465d69f4f19d48a5951daa50ae6a613eeaf6aa5d67d97 SHA512 eda5ec8abba1c4d7f8c455ed65c0a865926a74a909897c01c08d08b33f7033b8de7c8aa91adc6497518936a97cc4d7372947eafea2e67617275611a16d89c8d4 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104 -DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4 DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6 -EBUILD qca-2.3.2.ebuild 1995 BLAKE2B f054015be5f10231bd5c491412d2abb0b9ad1c94158e88cfd8bd6db6ef6128428822c03af21c189f1df04cfa8833d331a8174fa9804c1b0b560d3d0b6e77d92d SHA512 ae7417c07673b4755651236964ceea2d5bc4ef69ad1ff78affbeaabb357caaafb0f4400ea41ed428de380111760ab46e0611e852e883406862cd878fb77c3f10 EBUILD qca-2.3.3.ebuild 1840 BLAKE2B 0db025caefd777c276cb84c99221bcd7776ba56ba89d3a4659c09cba0190ed08c9b44f5196c87974ad7f0a7b9af208d7c057d37f54f1a12a00f7cf5d6e9f02d8 SHA512 e7c8d0f0fa6d15ef7823be6297024481f50c19f71342dafb4eafb38a55f66fbe7c9ee22baf1791391be672e5faa6b951017315b6d4c3c683a3ad44e71162d473 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867 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 af86e4539fba..000000000000 --- 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 34258aed1620..000000000000 --- 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 8d66157373c0..000000000000 --- 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 -} -- cgit v1.2.3