[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/

2023-05-10 Thread orbea 
commit: 3744eccc05fd490fb578d26107d884e487bee283
Author: orbea  riseup  net>
AuthorDate: Wed May 10 18:53:46 2023 +
Commit: orbea  riseup  net>
CommitDate: Wed May 10 18:53:46 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3744eccc

app-crypt/qca: sync ::gentoo

Signed-off-by: orbea  riseup.net>

 app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch | 54 ++
 app-crypt/qca/qca-2.3.5-r1.ebuild  |  1 +
 2 files changed, 55 insertions(+)

diff --git a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch 
b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
new file mode 100644
index 000..c9c581e
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/904234
+https://invent.kde.org/libraries/qca/-/commit/33a35a699928318032f62eab0e39e263c604ad9e
+https://invent.kde.org/libraries/qca/-/commit/714073747c4a3ccff7a8c85c72872bdf6bd3db4a
+
+From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001
+From: Pino Toscano 
+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.
+--- 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);
+-- 
+GitLab
+
+From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Mon, 20 Feb 2023 00:19:19 +0100
+Subject: [PATCH] Remove test that openssl has decided it's wrong
+
+--- a/unittest/pkits/pkits.cpp
 b/unittest/pkits/pkits.cpp
+@@ -256,6 +256,9 @@ void Pkits::pkits4_1_4()
+ 
+ void Pkits::pkits4_1_5()
+ {
++// openssl has decided that they don't want to support this ¯\_(ツ)_/¯
++// https://github.com/openssl/openssl/issues/20233
++#if 0
+ QStringList providersToTest;
+ providersToTest.append(QStringLiteral("qca-ossl"));
+ 
+@@ -298,6 +301,7 @@ void Pkits::pkits4_1_5()
+ QCOMPARE(cert.validate(trusted, untrusted), QCA::ValidityGood);
+ }
+ }
++#endif
+ }
+ 
+ void Pkits::pkits4_1_6()
+-- 
+GitLab

diff --git a/app-crypt/qca/qca-2.3.5-r1.ebuild 
b/app-crypt/qca/qca-2.3.5-r1.ebuild
index 0239b62..b64abeb 100644
--- a/app-crypt/qca/qca-2.3.5-r1.ebuild
+++ b/app-crypt/qca/qca-2.3.5-r1.ebuild
@@ -44,6 +44,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-disable-pgp-test.patch"
+   "${FILESDIR}/${PN}-2.3.5-openssl3-tests.patch"
"${FILESDIR}/${PN}-2.3.4-libressl.patch"
 )

[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/, app-crypt/qca/files/

2019-04-11 Thread Stefan Strogin 
commit: 656e54a46c18a478a03b9ff1d860fa03ef1d240e
Author: Stefan Strogin  gmail  com>
AuthorDate: Thu Apr 11 18:42:04 2019 +
Commit: Stefan Strogin  gmail  com>
CommitDate: Thu Apr 11 18:42:29 2019 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=656e54a4

app-crypt/qca: bump version to 2.2.0; update patch

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>

 app-crypt/qca/Manifest |  2 +-
 ...606-libressl.patch => qca-2.2.0-libressl.patch} | 52 ++
 ...a-2.2.0_pre20180606.ebuild => qca-2.2.0.ebuild} |  2 +-
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index f525059..421d83e 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1 +1 @@
-DIST qca-2.2.0_pre20180606.tar.xz 700756 BLAKE2B 
0204854a664f211e9289cd4609938fd21e62de5bec5d7f5a99843a12483c960b6f8cc7392dc84bcf0676220411106bf7f23c5059d4f7031791fe9a3259d21d2c
 SHA512 
78f9f8ebc726e95768034c580d5ac30933f7c06e026b7daad04f11477dc623e4267895e409f7830c5149e620876dcc524278ef569956d03820b0864d629c4df8
+DIST qca-2.2.0.tar.xz 691264 BLAKE2B 
3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf
 SHA512 
2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69

diff --git a/app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch 
b/app-crypt/qca/files/qca-2.2.0-libressl.patch
similarity index 66%
rename from app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch
rename to app-crypt/qca/files/qca-2.2.0-libressl.patch
index 2f6d461..f4c2f01 100644
--- a/app-crypt/qca/files/qca-2.2.0_pre20180606-libressl.patch
+++ b/app-crypt/qca/files/qca-2.2.0-libressl.patch
@@ -1,23 +1,24 @@
-From 32e4f55732e42103cd7ba5e84ddd086bf8103948 Mon Sep 17 00:00:00 2001
+From bfc0dd038fea35f004867867935eb695b958f849 Mon Sep 17 00:00:00 2001
 From: Stefan Strogin 
-Date: Fri, 5 Apr 2019 09:57:14 +0300
+Date: Fri, 5 Apr 2019 09:17:23 +0300
 Subject: [PATCH] Fix build with LibreSSL
 
 Provide RSA_meth_set_{sign,verify} for LibreSSL.
 Do not redefine M_ASN1_IA5STRING_new and RSA_F_RSA_EAY_PRIVATE_DECRYPT.
+Disable HKDF.
 
 Upstream-Status: Submitted [https://phabricator.kde.org/D20259]
 Signed-off-by: Stefan Strogin 
 ---
  plugins/qca-ossl/ossl110-compat.h | 34 ---
- plugins/qca-ossl/qca-ossl.cpp |  2 +-
- 2 files changed, 19 insertions(+), 17 deletions(-)
+ plugins/qca-ossl/qca-ossl.cpp | 10 -
+ 2 files changed, 23 insertions(+), 21 deletions(-)
 
 diff --git a/plugins/qca-ossl/ossl110-compat.h 
b/plugins/qca-ossl/ossl110-compat.h
-index ec15475..2d47835 100644
+index b320707..d093e50 100644
 --- a/plugins/qca-ossl/ossl110-compat.h
 +++ b/plugins/qca-ossl/ossl110-compat.h
-@@ -213,22 +213,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int 
(*priv_dec) (int flen, con
+@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int 
(*priv_dec) (int flen, con
  return 1;
  }
  
@@ -40,7 +41,7 @@ index ec15475..2d47835 100644
  static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
  {
  if (!meth) return 0;
-@@ -280,4 +264,22 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
+@@ -272,4 +256,22 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
  
  #endif // OPENSSL_VERSION_NUMBER < 0x1010L
  
@@ -64,10 +65,10 @@ index ec15475..2d47835 100644
 +
  #endif // OSSL110COMPAT_H
 diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index 39dbc2b..1216bef 100644
+index 11ecdc9..75c48fc 100644
 --- a/plugins/qca-ossl/qca-ossl.cpp
 +++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -61,7 +61,7 @@
+@@ -62,12 +62,12 @@
  #endif
  
  // OpenSSL 1.1.0 compatibility macros
@@ -76,6 +77,39 @@ index 39dbc2b..1216bef 100644
  #define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
  #define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
  #endif
+ 
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+ #include 
+ #endif
+ 
+@@ -1280,7 +1280,7 @@ public:
+ protected:
+ };
+ 
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+ class opensslHkdfContext : public HKDFContext
+ {
+ public:
+@@ -7416,7 +7416,7 @@ public:
+ #endif
+   list += "pbkdf1(sha1)";
+   list += "pbkdf2(sha1)";
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+   list += "hkdf(sha256)";
+ #endif
+   list += "pkey";
+@@ -7489,7 +7489,7 @@ public:
+ #endif
+   else if ( type == "pbkdf2(sha1)" )
+   return new opensslPbkdf2Context( this, type );
+-#ifdef OSSL_110
++#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
+   else if ( type == "hkdf(sha256)" )
+   return new