From 22da40f8aada201e6a0e190ac1f91afa7f030a45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 13 Aug 2020 21:15:17 +0200
Subject: [PATCH] qca-qt5: update to 2.3.1

---
 srcpkgs/qca-qt5/patches/libressl.patch | 90 +++++++++++++++++---------
 srcpkgs/qca-qt5/template               |  8 +--
 2 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/qca-qt5/patches/libressl.patch b/srcpkgs/qca-qt5/patches/libressl.patch
index 557c99950aa..5cdea3f1934 100644
--- a/srcpkgs/qca-qt5/patches/libressl.patch
+++ b/srcpkgs/qca-qt5/patches/libressl.patch
@@ -1,33 +1,65 @@
---- plugins/qca-ossl/ossl110-compat.h	2019-04-24 14:58:14.000000000 +0200
-+++ -	2019-11-19 04:28:55.887108555 +0100
-@@ -25,7 +25,7 @@
- #include <openssl/rsa.h>
- #include <openssl/dsa.h>
+--- plugins/qca-ossl/qca-ossl.cpp.bak	2020-08-13 20:47:26.316272036 +0200
++++ plugins/qca-ossl/qca-ossl.cpp	2020-08-13 21:14:09.838349311 +0200
+@@ -41,7 +41,13 @@
+ #include <openssl/pkcs12.h>
+ #include <openssl/ssl.h>
  
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #define RSA_F_RSA_METH_DUP 161
++#if !defined(LIBRESSL_VERSION_NUMBER)
+ #include <openssl/kdf.h>
++#endif
++#ifdef LIBRESSL_VERSION_NUMBER
++#define SSL_CIPHER_standard_name SSL_CIPHER_get_name
++#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT
++#endif
  
- static void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
---- plugins/qca-ossl/qca-ossl.cpp	2019-04-24 14:58:14.000000000 +0200
-+++ -	2019-11-19 04:29:29.745309997 +0100
-@@ -57,7 +57,7 @@
- 	((_STACK*) (1 ? p : (type*)0))
+ using namespace QCA;
+ 
+@@ -1262,6 +1268,7 @@
+ protected:
+ };
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ class opensslHkdfContext : public HKDFContext
+ {
+     Q_OBJECT
+@@ -1291,6 +1298,7 @@
+ 		return out;
+ 	}
+ };
++#endif
+ 
+ class opensslHMACContext : public MACContext
+ {
+@@ -4990,7 +4998,11 @@
+ 		case TLS::TLS_v1:
+ 			ctx = SSL_CTX_new(TLS_client_method());
+ 			SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
++#ifdef OPENSSL_NO_TLS1_3
++			SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
++#else
+ 			SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
++#endif
+ 			break;
+ 		case TLS::DTLS_v1:
+ 		default:
+@@ -6751,7 +6763,9 @@
  #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     #define OSSL_110
+ 		list += QStringLiteral("pbkdf1(sha1)");
+ 		list += QStringLiteral("pbkdf2(sha1)");
++#ifndef LIBRESSL_VERSION_NUMBER
+ 		list += QStringLiteral("hkdf(sha256)");
++#endif
+ 		list += QStringLiteral("pkey");
+ 		list += QStringLiteral("dlgroup");
+ 		list += QStringLiteral("rsa");
+@@ -6820,8 +6834,10 @@
  #endif
- 
---- plugins/qca-ossl/qca-ossl.cpp	2019-11-19 04:29:30.804925040 +0100
-+++ -	2019-11-19 04:30:35.947007237 +0100
-@@ -3826,7 +3826,7 @@
- 				p.policies = get_cert_policies(ex);
- 		}
- 
--#ifdef OSSL_110
-+#if defined(OSSL_110) || defined(LIBRESSL_VERSION_NUMBER)
- 		const
- #endif
- 		ASN1_BIT_STRING *signature;
+ 		else if ( type == QLatin1String("pbkdf2(sha1)") )
+ 			return new opensslPbkdf2Context( this, type );
++#ifndef LIBRESSL_VERSION_NUMBER
+ 		else if ( type == QLatin1String("hkdf(sha256)") )
+ 			return new opensslHkdfContext( this, type );
++#endif
+ 		else if ( type == QLatin1String("hmac(md5)") )
+ 			return new opensslHMACContext( EVP_md5(), this, type );
+ 		else if ( type == QLatin1String("hmac(sha1)") )
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index 2523d3095a1..c255fca31b2 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
-version=2.2.1
-revision=2
+version=2.3.1
+revision=1
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
@@ -10,11 +10,11 @@ hostmakedepends="pkg-config ca-certificates"
 makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://userbase.kde.org/QCA"
 distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
-checksum=d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02
+checksum=c13851109abefc4623370989fae3a745bf6b1acb3c2a13a8958539823e974e4b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"