[neon/extras/qca2/Neon/stable] debian: fix crash in hashunittest

Pino Toscano null at kde.org
Tue Dec 13 14:39:25 GMT 2022


Git commit 8f77ba893b225c650b352fb21654e617b352978b by Pino Toscano.
Committed on 22/10/2022 at 11:55.
Pushed by carlosdem into branch 'Neon/stable'.

fix crash in hashunittest

backport upstream commit 33a35a699928318032f62eab0e39e263c604ad9e

M  +3    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +29   -0    debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch

https://invent.kde.org/neon/extras/qca2/commit/8f77ba893b225c650b352fb21654e617b352978b

diff --git a/debian/changelog b/debian/changelog
index b1b5471..d49234b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ qca2 (2.3.5-0r1) UNRELEASED; urgency=medium
     failure due to unhandled files (Closes: #1019464)
     - pass to cmake: -DWITH_botan_PLUGIN=NO -DWITH_gcrypt_PLUGIN=NO
       -DWITH_nss_PLUGIN=NO -DWITH_pkcs11_PLUGIN=NO
+  * Backport upstream commit 33a35a699928318032f62eab0e39e263c604ad9e to fix
+    a crash in hashunittest; patch
+    upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Oct 2022 12:29:54 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 62d4fe7..086542f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
 pipeunittest_more_wait.diff
diff --git a/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch b/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
new file mode 100644
index 0000000..b18c237
--- /dev/null
+++ b/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
@@ -0,0 +1,29 @@
+From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 22 Oct 2022 13:51:17 +0200
+Subject: [PATCH] hashunittest: run sha384longtest only for providers that
+ support sha384
+
+Fixes commit bdb0e9d37d78ec8e01d4008dba5243afe9029346 that accidentally
+left the wrong logic when refactoring the file, and makes the check as
+done in the other longtest tests.
+---
+ unittest/hashunittest/hashunittest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unittest/hashunittest/hashunittest.cpp b/unittest/hashunittest/hashunittest.cpp
+index c2c25a0e..b208c94f 100644
+--- a/unittest/hashunittest/hashunittest.cpp
++++ b/unittest/hashunittest/hashunittest.cpp
+@@ -581,7 +581,7 @@ void HashUnitTest::sha384longtest()
+     fillerString.fill('a', 1000);
+ 
+     foreach (QString provider, providersToTest) {
+-        if (!QCA::isSupported("sha384", provider)) {
++        if (QCA::isSupported("sha384", provider)) {
+             // QTime t;
+             // t.start();
+             QCA::Hash shaHash(QStringLiteral("sha384"), provider);
+-- 
+2.35.1
+



More information about the Neon-commits mailing list